#include "includes.h"
#include "lib/samba3/samba3.h"
-struct smbconf_data {
- TALLOC_CTX *ctx;
- struct samba3 *db;
- struct samba3_share_info *current_share;
-};
-
struct samba3_domainsecrets *samba3_find_domainsecrets(struct samba3 *db, const char *name)
{
int i;
for (i = 0; i < db->secrets.domain_count; i++) {
- if (!StrCaseCmp(db->secrets.domains[i].name, name))
+ if (!strcasecmp_m(db->secrets.domains[i].name, name))
return &db->secrets.domains[i];
}
return NULL;
}
-struct samba3_share_info *samba3_find_share(struct samba3 *db, const char *name)
-{
- int i;
- for (i = 0; i < db->share_count; i++) {
- if (!StrCaseCmp(db->shares[i].name, name))
- return &db->shares[i];
- }
-
- return NULL;
-}
-
-
-struct samba3_share_info *samba3_find_add_share(struct samba3 *db, TALLOC_CTX* ctx, const char *name)
-{
- struct samba3_share_info *share = samba3_find_share(db, name);
-
- if (share)
- return share;
-
- db->shares = talloc_realloc(ctx, db->shares, struct samba3_share_info, db->share_count+1);
- ZERO_STRUCT(db->shares[db->share_count]);
- db->shares[db->share_count].name = talloc_strdup(ctx, name);
- db->share_count++;
-
- return &db->shares[db->share_count-1];
-}
-
-const char *samba3_get_param(struct samba3 *samba3, const char *section, const char *param)
+NTSTATUS samba3_read_passdb_backends(TALLOC_CTX *ctx, const char *libdir, struct samba3 *samba3)
{
+ char *dbfile;
+ NTSTATUS status = NT_STATUS_OK;
int i;
- struct samba3_share_info *share = samba3_find_share(samba3, section);
-
- if (share == NULL)
- return NULL;
-
- for (i = 0; i < share->parameter_count; i++) {
- if (!StrCaseCmp(share->parameters[i].name, param))
- return share->parameters[i].value;
+ const char **backends = param_get_string_list(samba3->configuration, NULL, "passdb backends", NULL);
+
+ /* Default to smbpasswd */
+ if (backends == NULL)
+ backends = str_list_make(ctx, "smbpasswd", LIST_SEP);
+ else
+ backends = str_list_copy(ctx, backends);
+
+ for (i = 0; backends[i]; i++) {
+ if (!strncmp(backends[i], "tdbsam", strlen("tdbsam"))) {
+ const char *p = strchr(backends[i], ':');
+ if (p && p[1]) {
+ dbfile = talloc_strdup(ctx, p+1);
+ } else {
+ dbfile = talloc_asprintf(ctx, "%s/passdb.tdb", libdir);
+ }
+ samba3_read_tdbsam(dbfile, ctx, &samba3->samaccounts, &samba3->samaccount_count);
+ talloc_free(dbfile);
+ } else if (!strncmp(backends[i], "smbpasswd", strlen("smbpasswd"))) {
+ const char *p = strchr(backends[i], ':');
+ if (p && p[1]) {
+ dbfile = talloc_strdup(ctx, p+1);
+ } else if ((p = param_get_string(samba3->configuration, NULL, "smb passwd file"))) {
+ dbfile = talloc_strdup(ctx, p);
+ } else {
+ dbfile = talloc_strdup(ctx, "/etc/samba/smbpasswd");
+ }
+
+ samba3_read_smbpasswd(dbfile, ctx, &samba3->samaccounts, &samba3->samaccount_count);
+ talloc_free(dbfile);
+ } else if (!strncmp(backends[i], "ldapsam", strlen("ldapsam"))) {
+ /* Will use samba3sam mapping module */
+ } else {
+ DEBUG(0, ("Upgrade from %s database not supported", backends[i]));
+ status = NT_STATUS_NOT_SUPPORTED;
+ continue;
+ }
}
- return NULL;
-}
-
+ talloc_free(backends);
-static BOOL samba3_sfunc (const char *name, void *_db)
-{
- struct smbconf_data *privdat = _db;
-
- privdat->current_share = samba3_find_add_share(privdat->db, privdat->ctx, name);
-
- return True;
-}
-
-static BOOL samba3_pfunc (const char *name, const char *value, void *_db)
-{
- struct smbconf_data *privdat = _db;
- struct samba3_parameter *p;
-
- privdat->current_share->parameters =
- talloc_realloc(privdat->ctx, privdat->current_share->parameters,
- struct samba3_parameter,
- privdat->current_share->parameter_count+1);
-
- p = &privdat->current_share->parameters[privdat->current_share->parameter_count];
- p->name = talloc_strdup(privdat->ctx, name);
- p->value = talloc_strdup(privdat->ctx, value);
-
- privdat->current_share->parameter_count++;
-
- return True;
+ return status;
}
-NTSTATUS samba3_read_smbconf(const char *fn, TALLOC_CTX *ctx, struct samba3 *db)
-{
- struct smbconf_data privdat;
-
- privdat.ctx = ctx;
- privdat.db = db;
- privdat.current_share = samba3_find_add_share(db, ctx, "global");
-
- if (!pm_process( fn, samba3_sfunc, samba3_pfunc, &privdat )) {
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- return NT_STATUS_OK;
-}
-
-NTSTATUS samba3_read(const char *smbconf, const char *libdir, TALLOC_CTX *ctx, struct samba3 **samba3)
+NTSTATUS samba3_read(const char *libdir, const char *smbconf, TALLOC_CTX *ctx, struct samba3 **samba3)
{
struct samba3 *ret;
char *dbfile = NULL;
ret = talloc_zero(ctx, struct samba3);
- if (smbconf)
- samba3_read_smbconf(smbconf, ctx, ret);
+ if (smbconf != NULL) {
+ ret->configuration = param_init(ret);
+ if (param_read(ret->configuration, smbconf) == -1) {
+ talloc_free(ret);
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+ }
dbfile = talloc_asprintf(ctx, "%s/account_policy.tdb", libdir);
samba3_read_account_policy(dbfile, ctx, &ret->policy);
samba3_read_winsdb(dbfile, ret, &ret->winsdb_entries, &ret->winsdb_count);
talloc_free(dbfile);
- dbfile = talloc_asprintf(ctx, "%s/passdb.tdb", libdir);
- samba3_read_tdbsam(dbfile, ctx, &ret->samaccounts, &ret->samaccount_count);
- talloc_free(dbfile);
+ samba3_read_passdb_backends(ctx, libdir, ret);
dbfile = talloc_asprintf(ctx, "%s/group_mapping.tdb", libdir);
samba3_read_grouptdb(dbfile, ctx, &ret->group);
git.samba.org / kai / samba.git / blobdiff