diff options
| author | Günther Deschner <gd@samba.org> | 2011-11-15 17:53:25 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-11-16 12:26:26 +0100 |
| commit | 636fa7a2cd6846b1a93cbc869735442b3a98ed60 (patch) | |
| tree | d1ab68fcc38003e38f71576265431fd6cf3ee200 | |
| parent | 8312ee136771befd2c04d877e3ab340e1b1366a7 (diff) | |
| download | samba-636fa7a2cd6846b1a93cbc869735442b3a98ed60.tar.gz samba-636fa7a2cd6846b1a93cbc869735442b3a98ed60.tar.bz2 samba-636fa7a2cd6846b1a93cbc869735442b3a98ed60.zip | |
s3-net: use better state variable name for smbldap_state.
Guenther
| -rw-r--r-- | source3/utils/net_sam.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index d0640dd7b3..7798fbb908 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -1583,7 +1583,7 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv) char *ldap_bk; char *ldap_uri = NULL; char *p; - struct smbldap_state *ls; + struct smbldap_state *state = NULL; GROUP_MAP *gmap = NULL; struct dom_sid gsid; gid_t domusers_gid = -1; @@ -1645,7 +1645,7 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv) goto failed; } - if (!NT_STATUS_IS_OK(smbldap_init(tc, NULL, ldap_uri, &ls))) { + if (!NT_STATUS_IS_OK(smbldap_init(tc, NULL, ldap_uri, &state))) { d_fprintf(stderr, _("Unable to connect to the LDAP server.\n")); goto failed; } @@ -1709,7 +1709,7 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv) talloc_autofree_ldapmod(tc, mods); - rc = smbldap_add(ls, dn, mods); + rc = smbldap_add(state, dn, mods); if (rc != LDAP_SUCCESS) { d_fprintf(stderr, _("Failed to add Domain Users group " @@ -1785,7 +1785,7 @@ domu_done: talloc_autofree_ldapmod(tc, mods); - rc = smbldap_add(ls, dn, mods); + rc = smbldap_add(state, dn, mods); if (rc != LDAP_SUCCESS) { d_fprintf(stderr, _("Failed to add Domain Admins group " @@ -1902,7 +1902,7 @@ doma_done: talloc_autofree_ldapmod(tc, mods); - rc = smbldap_add(ls, dn, mods); + rc = smbldap_add(state, dn, mods); if (rc != LDAP_SUCCESS) { d_fprintf(stderr, _("Failed to add Administrator user " @@ -2013,7 +2013,7 @@ doma_done: talloc_autofree_ldapmod(tc, mods); - rc = smbldap_add(ls, dn, mods); + rc = smbldap_add(state, dn, mods); if (rc != LDAP_SUCCESS) { d_fprintf(stderr, _("Failed to add Guest user to " @@ -2086,7 +2086,7 @@ doma_done: talloc_autofree_ldapmod(tc, mods); - rc = smbldap_add(ls, dn, mods); + rc = smbldap_add(state, dn, mods); if (rc != LDAP_SUCCESS) { d_fprintf(stderr, @@ -2099,11 +2099,11 @@ doma_done: done: - talloc_free(tc); + talloc_free(state); return 0; failed: - talloc_free(tc); + talloc_free(state); return -1; } |