diff options
| author | Michael Adam <obnox@samba.org> | 2010-12-08 00:39:28 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-01-02 12:51:55 +0100 |
| commit | 11016f2a6befc477c631c4f2ed8d9e7e4e250102 (patch) | |
| tree | 1d7443f5718b0a60eac4f8322c625bdbcef93c39 | |
| parent | 2d3a8b196fe1ef47a5fb7bc5c13671125f59da91 (diff) | |
| download | samba-11016f2a6befc477c631c4f2ed8d9e7e4e250102.tar.gz samba-11016f2a6befc477c631c4f2ed8d9e7e4e250102.tar.bz2 samba-11016f2a6befc477c631c4f2ed8d9e7e4e250102.zip | |
s3:net: remove alloc parameter from idmap_store_secret() (net idmap store).
| -rw-r--r-- | source3/utils/net_idmap.c | 10 | ||||
| -rw-r--r-- | source3/utils/net_proto.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index 488132b515..4bf6ecd0d6 100644 --- a/source3/utils/net_idmap.c +++ b/source3/utils/net_idmap.c @@ -289,7 +289,7 @@ static int net_idmap_set(struct net_context *c, int argc, const char **argv) d_printf("%s\n", _("Not implemented yet")); return -1; } -bool idmap_store_secret(const char *backend, bool alloc, +bool idmap_store_secret(const char *backend, const char *domain, const char *identity, const char *secret) { @@ -297,11 +297,7 @@ bool idmap_store_secret(const char *backend, bool alloc, int r; bool ret; - if (alloc) { - r = asprintf(&tmp, "IDMAP_ALLOC_%s", backend); - } else { - r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain); - } + r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain); if (r < 0) return false; @@ -363,7 +359,7 @@ static int net_idmap_secret(struct net_context *c, int argc, const char **argv) return -1; } - ret = idmap_store_secret("ldap", false, domain, dn, secret); + ret = idmap_store_secret("ldap", domain, dn, secret); if ( ! ret) { d_fprintf(stderr, _("Failed to store secret\n")); diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index 9e9e82fb84..99e0cbd7a4 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -86,7 +86,7 @@ int net_help(struct net_context *c, int argc, const char **argv); /* The following definitions come from utils/net_idmap.c */ -bool idmap_store_secret(const char *backend, bool alloc, +bool idmap_store_secret(const char *backend, const char *domain, const char *identity, const char *secret); int net_help_idmap(struct net_context *c, int argc, const char **argv); |