r9800: Add EJS interface to param. tridge, sorry this overlaps a bit

[sfrench/samba-autobuild/.git] / source4 / lib / samba3 / samba3.c

diff --git a/source4/lib/samba3/samba3.c b/source4/lib/samba3/samba3.c
index c74b1b5279e02f1bc42f5e2d768b8ff62ead3ff2..b919366ce3561af0774f651da01ae6e3252d4dbe 100644 (file)
--- a/source4/lib/samba3/samba3.c
+++ b/source4/lib/samba3/samba3.c
@@ -20,36 +20,63 @@
 #include "includes.h"
 #include "lib/samba3/samba3.h"
 
 #include "includes.h"
 #include "lib/samba3/samba3.h"
 

-struct samba3 *samba3_read(const char *libdir, TALLOC_CTX *ctx)
+struct samba3_domainsecrets *samba3_find_domainsecrets(struct samba3 *db, const char *name)

 {
 {

-       struct samba3 *ret;
-       char *dbfile;
-
-       ret = talloc(ctx, struct samba3);
+       int i;

        
        

-       asprintf(&dbfile, "%s/winsdb.dat", libdir);
-       samba3_read_winsdb(dbfile, ret, &ret->winsdb_entries, &ret->winsdb_count);
-       SAFE_FREE(dbfile);
+       for (i = 0; i < db->secrets.domain_count; i++) {
+               if (!strcasecmp_m(db->secrets.domains[i].name, name)) 
+                       return &db->secrets.domains[i];
+       }

 
 

-       asprintf(&dbfile, "%s/passdb.tdb", libdir);
-       samba3_read_tdbsam(dbfile, ctx, &ret->samaccounts, &ret->samaccount_count);
-       SAFE_FREE(dbfile);
+       return NULL;
+}

 
 

-       asprintf(&dbfile, "%s/groupdb.tdb", libdir);
-       samba3_read_grouptdb(dbfile, ctx, &ret->group);
-       SAFE_FREE(dbfile);
+NTSTATUS samba3_read(const char *libdir, const char *smbconf, TALLOC_CTX *ctx, struct samba3 **samba3)
+{
+       struct samba3 *ret;
+       char *dbfile = NULL;

 
 

-       asprintf(&dbfile, "%s/idmap.tdb", libdir);
-       samba3_read_idmap(dbfile, ctx, &ret->idmap);
-       SAFE_FREE(dbfile);
+       ret = talloc_zero(ctx, struct samba3);

 
 

-       asprintf(&dbfile, "%s/account_policy.tdb", libdir);
+       if (smbconf) {
+               ret->configuration = param_init(ret);
+               param_read(ret->configuration, smbconf);
+       }
+
+       dbfile = talloc_asprintf(ctx, "%s/account_policy.tdb", libdir);

        samba3_read_account_policy(dbfile, ctx, &ret->policy);
        samba3_read_account_policy(dbfile, ctx, &ret->policy);

-       SAFE_FREE(dbfile);
+       talloc_free(dbfile);

 
 

-       asprintf(&dbfile, "%s/registry.tdb", libdir);
+       dbfile = talloc_asprintf(ctx, "%s/registry.tdb", libdir);

        samba3_read_regdb(dbfile, ctx, &ret->registry);
        samba3_read_regdb(dbfile, ctx, &ret->registry);

-       SAFE_FREE(dbfile);
+       talloc_free(dbfile);
+
+       dbfile = talloc_asprintf(ctx, "%s/secrets.tdb", libdir);
+       samba3_read_secrets(dbfile, ctx, &ret->secrets);
+       talloc_free(dbfile);
+
+       dbfile = talloc_asprintf(ctx, "%s/share_info.tdb", libdir);
+       samba3_read_share_info(dbfile, ctx, ret);
+       talloc_free(dbfile);
+
+       dbfile = talloc_asprintf(ctx, "%s/winbindd_idmap.tdb", libdir);
+       samba3_read_idmap(dbfile, ctx, &ret->idmap);
+       talloc_free(dbfile);
+
+       dbfile = talloc_asprintf(ctx, "%s/wins.dat", libdir);
+       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);
+
+       dbfile = talloc_asprintf(ctx, "%s/group_mapping.tdb", libdir);
+       samba3_read_grouptdb(dbfile, ctx, &ret->group);
+       talloc_free(dbfile);
+
+       *samba3 = ret;

 
 

-       return ret;
+       return NT_STATUS_OK;

 }
 }