From: basney <basney>
Date: Fri, 4 Sep 2009 17:57:17 +0000 (+0000)
Subject: merged OPENSSH_5_2P1_GSSAPI_20090904 to GPT-branch
X-Git-Tag: OPENSSH_5_2P1_GSSAPI_20090904_GPT-merged
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/refs/tags/OPENSSH_5_2P1_GSSAPI_20090904_GPT-merged

merged OPENSSH_5_2P1_GSSAPI_20090904 to GPT-branch
---

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index de0f7d5..b6b23b7 100644
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -531,6 +531,7 @@ void
 ssh_gssapi_rekey_creds() {
 	int ok;
 #ifdef USE_PAM
+    int ret;
 	pam_handle_t *pamh = NULL;
 	struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
 	char *envstr;
diff --git a/openssh/monitor.c b/openssh/monitor.c
index e0434d5..3a39cef 100644
--- a/openssh/monitor.c
+++ b/openssh/monitor.c
@@ -680,6 +680,11 @@ mm_answer_pwnamallow(int sock, Buffer *m)
 
 	if (authctxt->user) xfree(authctxt->user);
 	authctxt->user = xstrdup(username);
+#ifdef USE_PAM
+    if (options.permit_pam_user_change)
+        setproctitle("%s [priv]", pwent ? "[pam]" : "unknown");
+    else
+#endif
 	setproctitle("%s [priv]", pwent ? username : "unknown");
 	xfree(username);
 
diff --git a/openssh/servconf.c b/openssh/servconf.c
index 96a27f3..c3c44c1 100644
--- a/openssh/servconf.c
+++ b/openssh/servconf.c
@@ -399,7 +399,7 @@ static struct {
 	/* Portable-specific options */
 #ifdef USE_PAM
 	{ "usepam", sUsePAM, SSHCFG_GLOBAL },
-	{ "permitpamuserchange", sPermitPAMUserChange, SSHCFG_GLOBAL }
+	{ "permitpamuserchange", sPermitPAMUserChange, SSHCFG_GLOBAL },
 #else
 	{ "usepam", sUnsupported, SSHCFG_GLOBAL },
 	{ "permitpamuserchange", sUnsupported, SSHCFG_GLOBAL },