Author: abartlet
Date: 2007-11-28 05:24:59 +0000 (Wed, 28 Nov 2007)
New Revision: 26183

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26183

Log:
The idea of a self-seeding secrets.ldb is nice, but in practice we do
this with the provision, which sets up a very different database.
Removing this ensures we are consistant.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/param/secrets.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/secrets.c
===================================================================
--- branches/SAMBA_4_0/source/param/secrets.c   2007-11-28 04:24:12 UTC (rev 
26182)
+++ branches/SAMBA_4_0/source/param/secrets.c   2007-11-28 05:24:59 UTC (rev 
26183)
@@ -105,11 +105,6 @@
        char *path;
        const char *url;
        struct ldb_context *ldb;
-       bool existed;
-       const char *init_ldif = 
-               "dn: @ATTRIBUTES\n" \
-               "computerName: CASE_INSENSITIVE\n" \
-               "flatname: CASE_INSENSITIVE\n";
 
        url = lp_secrets_url(global_loadparm);
        if (!url || !url[0]) {
@@ -121,8 +116,6 @@
                return NULL;
        }
 
-       existed = file_exist(path);
-
        /* Secrets.ldb *must* always be local.  If we call for a
         * system_session() we will recurse */
        ldb = ldb_wrap_connect(mem_ctx, global_loadparm, path, NULL, NULL, 0, 
NULL);
@@ -131,10 +124,6 @@
                return NULL;
        }
        
-       if (!existed) {
-               gendb_add_ldif(ldb, init_ldif);
-       }
-
        return ldb;
 }
 

Reply via email to