Attachment 2030 Details for Bug 3916 – pam_winbind.c diff against release 3.0.23

[patch] pam_winbind.c diff against release 3.0.23

pam_winbind.c.diff (text/plain), 3.10 KB, created by Dietrich Streifert on 2006-07-13 04:11:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dietrich Streifert

Created: 2006-07-13 04:11:01 UTC

Size: 3.10 KB

patch

obsolete

>*** samba-3.0.23.orig/source/nsswitch/pam_winbind.c	Fri Jun  9 21:30:30 2006
>--- samba-3.0.23/source/nsswitch/pam_winbind.c	Thu Jul 13 11:07:42 2006
>***************
>*** 47,61 ****
>  {
>  	int ctrl = 0;
>  	const char *config_file = NULL;
>  
>  	if (d == NULL) {
>  		goto config_from_pam;
>  	}
>  
>! 	for (; argc-- > 0; ++argv) {
>! 		if (!strncasecmp(*argv, "config", strlen("config"))) {
>  			ctrl |= WINBIND_CONFIG_FILE;
>! 			config_file = argv[argc];
>  			break;
>  		}
>  	}
>--- 47,63 ----
>  {
>  	int ctrl = 0;
>  	const char *config_file = NULL;
>+ 	int i;
>+ 	const char **v;
>  
>  	if (d == NULL) {
>  		goto config_from_pam;
>  	}
>  
>! 	for (i=argc,v=argv; i-- > 0; ++v) {
>! 		if (!strncasecmp(*v, "config", strlen("config"))) {
>  			ctrl |= WINBIND_CONFIG_FILE;
>! 			config_file = v[i];
>  			break;
>  		}
>  	}
>***************
>*** 92,122 ****
>  
>  config_from_pam:
>  	/* step through arguments */
>! 	for (; argc-- > 0; ++argv) {
>  
>  		/* generic options */
>! 		if (!strcmp(*argv,"debug"))
>  			ctrl |= WINBIND_DEBUG_ARG;
>! 		else if (!strcasecmp(*argv, "use_authtok"))
>  			ctrl |= WINBIND_USE_AUTHTOK_ARG;
>! 		else if (!strcasecmp(*argv, "use_first_pass"))
>  			ctrl |= WINBIND_USE_FIRST_PASS_ARG;
>! 		else if (!strcasecmp(*argv, "try_first_pass"))
>  			ctrl |= WINBIND_TRY_FIRST_PASS_ARG;
>! 		else if (!strcasecmp(*argv, "unknown_ok"))
>  			ctrl |= WINBIND_UNKNOWN_OK_ARG;
>! 		else if (!strncasecmp(*argv, "require_membership_of", strlen("require_membership_of")))
>  			ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
>! 		else if (!strncasecmp(*argv, "require-membership-of", strlen("require-membership-of")))
>  			ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
>! 		else if (!strcasecmp(*argv, "krb5_auth"))
>  			ctrl |= WINBIND_KRB5_AUTH;
>! 		else if (!strncasecmp(*argv, "krb5_ccache_type", strlen("krb5_ccache_type")))
>  			ctrl |= WINBIND_KRB5_CCACHE_TYPE;
>! 		else if (!strcasecmp(*argv, "cached_login"))
>  			ctrl |= WINBIND_CACHED_LOGIN;
>  		else {
>! 			_pam_log(LOG_ERR, "pam_parse: unknown option; %s", *argv);
>  		}
>  
>  	}
>--- 94,124 ----
>  
>  config_from_pam:
>  	/* step through arguments */
>! 	for (i=argc,v=argv; i-- > 0; ++v) {
>  
>  		/* generic options */
>! 		if (!strcmp(*v,"debug"))
>  			ctrl |= WINBIND_DEBUG_ARG;
>! 		else if (!strcasecmp(*v, "use_authtok"))
>  			ctrl |= WINBIND_USE_AUTHTOK_ARG;
>! 		else if (!strcasecmp(*v, "use_first_pass"))
>  			ctrl |= WINBIND_USE_FIRST_PASS_ARG;
>! 		else if (!strcasecmp(*v, "try_first_pass"))
>  			ctrl |= WINBIND_TRY_FIRST_PASS_ARG;
>! 		else if (!strcasecmp(*v, "unknown_ok"))
>  			ctrl |= WINBIND_UNKNOWN_OK_ARG;
>! 		else if (!strncasecmp(*v, "require_membership_of", strlen("require_membership_of")))
>  			ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
>! 		else if (!strncasecmp(*v, "require-membership-of", strlen("require-membership-of")))
>  			ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
>! 		else if (!strcasecmp(*v, "krb5_auth"))
>  			ctrl |= WINBIND_KRB5_AUTH;
>! 		else if (!strncasecmp(*v, "krb5_ccache_type", strlen("krb5_ccache_type")))
>  			ctrl |= WINBIND_KRB5_CCACHE_TYPE;
>! 		else if (!strcasecmp(*v, "cached_login"))
>  			ctrl |= WINBIND_CACHED_LOGIN;
>  		else {
>! 			_pam_log(LOG_ERR, "pam_parse: unknown option; %s", *v);
>  		}
>  
>  	}

Actions: View

Attachments on bug 3916: 2025 | 2028 | 2029 | 2030