sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r23707: - Move the asprintf() call to create the key even in

Browse Source 
get_conf_item_string() to the later if statement.
- Also move the key definition to the later if statement in
  get_conf_item_string() and get_conf_item_int().
(This used to be commit 3a82ec943a3828b843dd47aaa0e360844d4dfb91)
This commit is contained in:
Lars Müller 2007-07-04 19:52:51 +00:00 committed by Gerald (Jerry) Carter
parent 85f7c7127f
commit 2f6b9c1ec4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source3/nsswitch/pam_winbind.c
View File

@ -1491,24 +1491,12 @@ const char *get_conf_item_string(const pam_handle_t *pamh,
{
int i = 0;
const char *parm_opt = NULL;
char *key = NULL;
if (!(ctrl & config_flag)) {
goto out;
}
/* let the pam opt take precedence over the pam_winbind.conf option */
if (d != NULL) {
if (!asprintf(&key, "global:%s", item)) {
goto out;
}
parm_opt = iniparser_getstr(d, key);
SAFE_FREE(key);
}
for ( i=0; i<argc; i++ ) {
if ((strncmp(argv[i], item, strlen(item)) == 0)) {
@ -1524,6 +1512,15 @@ const char *get_conf_item_string(const pam_handle_t *pamh,
}
if (d != NULL) {
char *key = NULL;
if (!asprintf(&key, "global:%s", item)) {
goto out;
}
parm_opt = iniparser_getstr(d, key);
SAFE_FREE(key);
_pam_log_debug(pamh, ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
}
out:
@ -1537,8 +1534,7 @@ int get_config_item_int(const pam_handle_t *pamh,
dictionary *d,
const char *item)
{
int parm_opt = -1, i = 0;
char *key = NULL;
int i, parm_opt = -1;
/* let the pam opt take precedence over the pam_winbind.conf option */
for (i = 0; i < argc; i++) {
@ -1561,6 +1557,8 @@ int get_config_item_int(const pam_handle_t *pamh,
}
if (d != NULL) {
char *key = NULL;
if (!asprintf(&key, "global:%s", item)) {
goto out;
}