|
Line
Link Here
|
| 0 |
-- sshd.c.original Tue Aug 16 21:21:50 2005 |
0 |
diff -u sshd.c.original sshd.c |
|
|
1 |
++ sshd.c Wed Aug 17 13:10:06 2005 |
|
Lines 103-108
Link Here
|
| 103 |
#define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3) |
103 |
#define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3) |
| 104 |
#define REEXEC_MIN_FREE_FD (STDERR_FILENO + 4) |
104 |
#define REEXEC_MIN_FREE_FD (STDERR_FILENO + 4) |
|
|
105 |
#ifdef SGESSH_INTEGRATION |
| 106 |
extern int sgessh_readconfig(void); |
| 107 |
extern void sgessh_do_setusercontext(struct passwd *); |
| 108 |
#endif |
| 109 |
|
| 105 |
extern char *__progname; |
110 |
extern char *__progname; |
| 106 |
/* Server configuration options. */ |
111 |
/* Server configuration options. */ |
|
Lines 666-672
Link Here
|
| 666 |
demote_sensitive_data(); |
671 |
demote_sensitive_data(); |
| 667 |
/* Drop privileges */ |
672 |
/* Drop privileges */ |
| 668 |
do_setusercontext(authctxt->pw); |
673 |
|
|
|
674 |
#ifdef SGESSH_INTEGRATION |
| 675 |
sgessh_do_setusercontext(authctxt->pw); |
| 676 |
#else |
| 677 |
do_setusercontext(authctxt->pw); |
| 678 |
#endif |
| 669 |
/* It is safe now to apply the key state */ |
679 |
/* It is safe now to apply the key state */ |
| 670 |
monitor_apply_keystate(pmonitor); |
680 |
monitor_apply_keystate(pmonitor); |
|
Lines 890-895
Link Here
|
| 890 |
__progname = ssh_get_progname(av[0]); |
900 |
__progname = ssh_get_progname(av[0]); |
| 891 |
init_rng(); |
901 |
init_rng(); |
|
|
902 |
#ifdef SGESSH_INTEGRATION |
| 903 |
sgessh_readconfig(); |
| 904 |
#endif |
| 905 |
|
| 892 |
/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ |
906 |
/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ |
| 893 |
saved_argc = ac; |
907 |
saved_argc = ac; |
| 894 |
rexec_argc = ac; |
908 |
rexec_argc = ac; |