Attachment 1654 Details for Bug 1583 – Patch against CVS

[patch] Patch against CVS

bug1583.patch (text/plain), 1.51 KB, created by Miguel Sanders on 2009-06-25 23:49:06 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Sanders

Created: 2009-06-25 23:49:06 AEST

Size: 1.51 KB

patch

obsolete

>Index: auth-krb5.c
>===================================================================
>RCS file: /cvs/openssh/auth-krb5.c,v
>retrieving revision 1.35
>diff -u -p -r1.35 auth-krb5.c
>--- auth-krb5.c	5 Aug 2006 02:39:39 -0000	1.35
>+++ auth-krb5.c	25 Jun 2009 13:45:02 -0000
>@@ -52,6 +52,10 @@
> #include <string.h>
> #include <krb5.h>
> 
>+#ifdef _AIX
>+#include <usersec.h>
>+#endif /* _AIX */
>+
> extern ServerOptions	 options;
> 
> static int
>@@ -79,14 +83,48 @@ auth_krb5_password(Authctxt *authctxt, c
> 	krb5_ccache ccache = NULL;
> 	int len;
> 
>+#ifdef _AIX
>+	len = 1;
>+	char *authdomain = NULL;
>+	char *authname = NULL;
>+	setuserdb(S_READ);
>+	getuserattr(authctxt->pw->pw_name, S_AUTHDOMAIN, &authdomain, SEC_CHAR);
>+	getuserattr(authctxt->pw->pw_name, S_AUTHNAME, &authname, SEC_CHAR);
>+	
>+	if (authname)
>+		len += strlen(authname);
>+	else
>+		len += strlen(authctxt->pw->pw_name);
>+
>+	if (authdomain)
>+		len += (strlen(authdomain) + 1);
>+
>+	char *client = xmalloc(len);
>+	if (authname)
>+		strcpy(client,authname);
>+	else
>+		strcpy(client,authctxt->pw->pw_name);
>+	
>+	if (authdomain) {
>+		strcat(client,"@");
>+		strcat(client,authdomain);
>+	}
>+#endif /* _AIX */	
> 	temporarily_use_uid(authctxt->pw);
> 
> 	problem = krb5_init(authctxt);
> 	if (problem)
> 		goto out;
> 
>+#ifdef _AIX
>+	problem = krb5_parse_name(authctxt->krb5_ctx, client,
>+		    &authctxt->krb5_user);
>+	xfree(client);
>+	enduserdb();
>+#else
> 	problem = krb5_parse_name(authctxt->krb5_ctx, authctxt->pw->pw_name,
> 		    &authctxt->krb5_user);
>+#endif /* _AIX */
> 	if (problem)
> 		goto out;
>

Actions: View | Diff

Attachments on bug 1583: 1621 | 1622 | 1627 | 1653 | 1654 | 1672 | 1713 | 1745