diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2008-10-01 09:38:43 -0600 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-10-13 14:15:19 -0400 |
| commit | a93e2b0d0215010e82496558a175b04f729ae812 (patch) | |
| tree | f712fd15a4ff981df08f2f95219d7075af7c5498 /ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c | |
| parent | b4ead84f6aae5828a4088a565487fb965069c93d (diff) | |
| download | freeipa-a93e2b0d0215010e82496558a175b04f729ae812.tar.gz freeipa-a93e2b0d0215010e82496558a175b04f729ae812.tar.xz freeipa-a93e2b0d0215010e82496558a175b04f729ae812.zip | |
Do not add enabled user to activated group - clean up parse_acct_disable
If a user needs to be enabled, just delete the user from the inactivated group,
but do not add to the activated group. If a user is in no group, the user is
active by default. IPA uses the activated group for override purposes.
parse_acct_disable is only used when the config changes, but I cleaned it
up anyway to make the code clearer.
Diffstat (limited to 'ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c')
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c b/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c index a887e89ae..45efa6df0 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c +++ b/ipa-server/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c @@ -166,14 +166,11 @@ parse_acct_disable(const char *theval) } if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_NONE)) { retval = ACCT_DISABLE_NONE; - } - if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_TO_AD)) { + } else if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_TO_AD)) { retval = ACCT_DISABLE_TO_AD; - } - if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_TO_DS)) { + } else if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_TO_DS)) { retval = ACCT_DISABLE_TO_DS; - } - if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_BOTH)) { + } else if (!PL_strcasecmp(theval, IPA_WINSYNC_ACCT_DISABLE_BOTH)) { retval = ACCT_DISABLE_BOTH; } |