IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-14 02:11:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

pwd-plugin: format/style changes

Browse Source 
Use __func__ in log functions instead of the explicit function name
so that if the function need to be renamed later logs reflect the
change automatically w/o the need to change all occurrences.

Also makes a grep for the function name less noisy avoiding tons of
false positives.
This commit is contained in:
Simo Sorce 2010-10-01 12:29:05 -04:00
parent fea9181eaf
commit 19d3ba9733
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c
View File

@ -157,28 +157,26 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
config = calloc(1, sizeof(struct ipapwd_krbcfg)); config = calloc(1, sizeof(struct ipapwd_krbcfg));
if (!config) { if (!config) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "Out of memory!\n");
"Out of memory!\n");
goto free_and_error; goto free_and_error;
} }
kmkey = calloc(1, sizeof(krb5_keyblock)); kmkey = calloc(1, sizeof(krb5_keyblock));
if (!kmkey) { if (!kmkey) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "Out of memory!\n");
"Out of memory!\n");
goto free_and_error; goto free_and_error;
} }
config->kmkey = kmkey; config->kmkey = kmkey;
krberr = krb5_init_context(&config->krbctx); krberr = krb5_init_context(&config->krbctx);
if (krberr) { if (krberr) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__,
"krb5_init_context failed\n"); "krb5_init_context failed\n");
goto free_and_error; goto free_and_error;
} }
ret = krb5_get_default_realm(config->krbctx, &config->realm); ret = krb5_get_default_realm(config->krbctx, &config->realm);
if (ret) { if (ret) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__,
"Failed to get default realm?!\n"); "Failed to get default realm?!\n");
goto free_and_error; goto free_and_error;
} }
@ -186,8 +184,7 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
/* get the Realm Container entry */ /* get the Realm Container entry */
ret = ipapwd_getEntry(ipa_realm_dn, &realm_entry, NULL); ret = ipapwd_getEntry(ipa_realm_dn, &realm_entry, NULL);
if (ret != LDAP_SUCCESS) { if (ret != LDAP_SUCCESS) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "No realm Entry?\n");
"No realm Entry?\n");
goto free_and_error; goto free_and_error;
} }
@ -195,36 +192,33 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a); ret = slapi_entry_attr_find(realm_entry, "krbMKey", &a);
if (ret == -1) { if (ret == -1) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "No master key??\n");
"No master key??\n");
goto free_and_error; goto free_and_error;
} }
/* there should be only one value here */ /* there should be only one value here */
ret = slapi_attr_first_value(a, &v); ret = slapi_attr_first_value(a, &v);
if (ret == -1) { if (ret == -1) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "No master key??\n");
"No master key??\n");
goto free_and_error; goto free_and_error;
} }
bval = slapi_value_get_berval(v); bval = slapi_value_get_berval(v);
if (!bval) { if (!bval) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__,
"Error retrieving master key berval\n"); "Error retrieving master key berval\n");
goto free_and_error; goto free_and_error;
} }
be = ber_init(bval); be = ber_init(bval);
if (!bval) { if (!bval) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "ber_init() failed!\n");
"ber_init() failed!\n");
goto free_and_error; goto free_and_error;
} }
tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey); tag = ber_scanf(be, "{i{iO}}", &tmp, &ttype, &mkey);
if (tag == LBER_ERROR) { if (tag == LBER_ERROR) {
slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_TRACE, __func__,
"Bad Master key encoding ?!\n"); "Bad Master key encoding ?!\n");
goto free_and_error; goto free_and_error;
} }
@ -234,8 +228,7 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
kmkey->length = mkey->bv_len; kmkey->length = mkey->bv_len;
kmkey->contents = malloc(mkey->bv_len); kmkey->contents = malloc(mkey->bv_len);
if (!kmkey->contents) { if (!kmkey->contents) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "Out of memory!\n");
"Out of memory!\n");
goto free_and_error; goto free_and_error;
} }
memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len); memcpy(kmkey->contents, mkey->bv_val, mkey->bv_len);
@ -246,7 +239,8 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
/*** get the Supported Enc/Salt types ***/ /*** get the Supported Enc/Salt types ***/
encsalts = slapi_entry_attr_get_charray(realm_entry, "krbSupportedEncSaltTypes"); encsalts = slapi_entry_attr_get_charray(realm_entry,
"krbSupportedEncSaltTypes");
if (encsalts) { if (encsalts) {
ret = new_ipapwd_encsalt(config->krbctx, ret = new_ipapwd_encsalt(config->krbctx,
(const char * const *)encsalts, (const char * const *)encsalts,
@ -254,7 +248,7 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
&config->num_supp_encsalts); &config->num_supp_encsalts);
slapi_ch_array_free(encsalts); slapi_ch_array_free(encsalts);
} else { } else {
slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_TRACE, __func__,
"No configured salt types use defaults\n"); "No configured salt types use defaults\n");
ret = new_ipapwd_encsalt(config->krbctx, ret = new_ipapwd_encsalt(config->krbctx,
ipapwd_def_encsalts, ipapwd_def_encsalts,
@ -262,14 +256,15 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
&config->num_supp_encsalts); &config->num_supp_encsalts);
} }
if (ret) { if (ret) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__,
"Can't get Supported EncSalt Types\n"); "Can't get Supported EncSalt Types\n");
goto free_and_error; goto free_and_error;
} }
/*** get the Preferred Enc/Salt types ***/ /*** get the Preferred Enc/Salt types ***/
encsalts = slapi_entry_attr_get_charray(realm_entry, "krbDefaultEncSaltTypes"); encsalts = slapi_entry_attr_get_charray(realm_entry,
"krbDefaultEncSaltTypes");
if (encsalts) { if (encsalts) {
ret = new_ipapwd_encsalt(config->krbctx, ret = new_ipapwd_encsalt(config->krbctx,
(const char * const *)encsalts, (const char * const *)encsalts,
@ -277,7 +272,7 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
&config->num_pref_encsalts); &config->num_pref_encsalts);
slapi_ch_array_free(encsalts); slapi_ch_array_free(encsalts);
} else { } else {
slapi_log_error(SLAPI_LOG_TRACE, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_TRACE, __func__,
"No configured salt types use defaults\n"); "No configured salt types use defaults\n");
ret = new_ipapwd_encsalt(config->krbctx, ret = new_ipapwd_encsalt(config->krbctx,
ipapwd_def_encsalts, ipapwd_def_encsalts,
@ -285,7 +280,7 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
&config->num_pref_encsalts); &config->num_pref_encsalts);
} }
if (ret) { if (ret) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__,
"Can't get Preferred EncSalt Types\n"); "Can't get Preferred EncSalt Types\n");
goto free_and_error; goto free_and_error;
} }
@ -295,17 +290,17 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
/* get the Realm Container entry */ /* get the Realm Container entry */
ret = ipapwd_getEntry(ipa_pwd_config_dn, &config_entry, NULL); ret = ipapwd_getEntry(ipa_pwd_config_dn, &config_entry, NULL);
if (ret != LDAP_SUCCESS) { if (ret != LDAP_SUCCESS) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__,
"No config Entry? Impossible!\n"); "No config Entry? Impossible!\n");
goto free_and_error; goto free_and_error;
} }
config->passsync_mgrs = slapi_entry_attr_get_charray(config_entry, "passSyncManagersDNs"); config->passsync_mgrs =
slapi_entry_attr_get_charray(config_entry, "passSyncManagersDNs");
/* now add Directory Manager, it is always added by default */ /* now add Directory Manager, it is always added by default */
tmpstr = slapi_ch_strdup("cn=Directory Manager"); tmpstr = slapi_ch_strdup("cn=Directory Manager");
slapi_ch_array_add(&config->passsync_mgrs, tmpstr); slapi_ch_array_add(&config->passsync_mgrs, tmpstr);
if (config->passsync_mgrs == NULL) { if (config->passsync_mgrs == NULL) {
slapi_log_error(SLAPI_LOG_FATAL, "ipapwd_getConfig", slapi_log_error(SLAPI_LOG_FATAL, __func__, "Out of memory!\n");
"Out of memory!\n");
goto free_and_error; goto free_and_error;
} }
for (i = 0; config->passsync_mgrs[i]; i++) /* count */ ; for (i = 0; config->passsync_mgrs[i]; i++) /* count */ ;