Attachment 1621 Details for Bug 1583 – Patch for user principal name

[patch] Patch for user principal name

auth-krb5.patch (text/plain), 1.56 KB, created by Miguel Sanders on 2009-04-02 16:37:43 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Sanders

Created: 2009-04-02 16:37:43 AEDT

Size: 1.56 KB

patch

obsolete

>*** auth-krb5.c	Sat Mar 28 19:07:10 2009
>--- auth-krb5-new.c	Sun Mar 29 20:56:11 2009
>***************
>*** 52,57 ****
>--- 52,61 ----
>  #include <string.h>
>  #include <krb5.h>
>  
>+ #ifdef _AIX
>+ #include <usersec.h>
>+ #endif /* _AIX */
>+ 
>  extern ServerOptions	 options;
>  
>  static int
>***************
>*** 84,92 ****
>  	problem = krb5_init(authctxt);
>  	if (problem)
>  		goto out;
>  
>! 	problem = krb5_parse_name(authctxt->krb5_ctx, authctxt->pw->pw_name,
>! 		    &authctxt->krb5_user);
>  	if (problem)
>  		goto out;
>  
>--- 88,127 ----
>  	problem = krb5_init(authctxt);
>  	if (problem)
>  		goto out;
>+ #ifdef _AIX
>+ 	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);
>+ 	len = 1;
>+ 	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);
>! 	}
>!         
>! 	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