system/doas
system/doas
1
0
Fork 0
mirror of https://github.com/slicer69/doas synced 2024-10-07 00:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore old behavior on Linux which was broken by the last commit

Browse source 
Small change in the Makefile so doas compiles on Ubuntu 16.04
This commit is contained in:
Tobias Kortkamp 2016-11-03 21:28:20 +01:00
parent dbfba4e976
commit 7ab94a448a
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -15,7 +15,7 @@ ifeq ($(UNAME_S),FreeBSD)
endif
all: $(OBJECTS)
$(CC) -o $(BIN) $(LDFLAGS) $(OBJECTS)
$(CC) -o $(BIN) $(OBJECTS) $(LDFLAGS)
env.o: doas.h env.c

18
doas.c
View file

@ -426,6 +426,8 @@ main(int argc, char **argv)
} while (/*CONSTCOND*/0)
pam_handle_t *pamh = NULL;
int pam_err;
#ifndef linux
int temp_stdin;
/* openpam_ttyconv checks if stdin is a terminal and
@ -442,6 +444,15 @@ main(int argc, char **argv)
if (temp_stdin == -1)
err(1, "dup");
close(STDIN_FILENO);
#else
/* force password prompt to display on stderr, not stdout */
int temp_stdout = dup(1);
if (temp_stdout == -1)
err(1, "dup");
close(1);
if (dup2(2, 1) == -1)
err(1, "dup2");
#endif
pam_err = pam_start("doas", myname, &pamc, &pamh);
if (pam_err != PAM_SUCCESS) {
@ -493,10 +504,17 @@ main(int argc, char **argv)
}
pam_end(pamh, pam_err);
#ifndef linux
/* Re-establish stdin */
if (dup2(temp_stdin, STDIN_FILENO) == -1)
err(1, "dup2");
close(temp_stdin);
#else
/* Re-establish stdout */
close(1);
if (dup2(temp_stdout, 1) == -1)
err(1, "dup2");
#endif
#else
#error No auth module!
#endif