diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-13 22:49:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-13 22:49:08 +0200 |
| commit | 60a6682c855cbe5094433881649e7ed4945a06e7 (patch) | |
| tree | d66516ad8b6695335b6ded31bb664b5eaf86d59f /source4/param | |
| parent | 148d3b170ae00d4001fa011450c7238052d32ae2 (diff) | |
| parent | 6b013c90fda01974ac0c27ac035ce78958276aad (diff) | |
| download | samba-60a6682c855cbe5094433881649e7ed4945a06e7.tar.gz samba-60a6682c855cbe5094433881649e7ed4945a06e7.tar.bz2 samba-60a6682c855cbe5094433881649e7ed4945a06e7.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
(This used to be commit 9b8448c1e4567be26fa4890c647e0d4d46efbe20)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/provision.c | 6 | ||||
| -rw-r--r-- | source4/param/provision.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source4/param/provision.c b/source4/param/provision.c index e55d984e55..70ef618b6e 100644 --- a/source4/param/provision.c +++ b/source4/param/provision.c @@ -64,14 +64,12 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, return NT_STATUS_UNSUCCESSFUL; } - DEBUG(0,("New Server[%s] in Site[%s]\n", settings->dns_name, - settings->site_name)); + DEBUG(0,("New Server in Site[%s]\n", + settings->site_name)); DEBUG(0,("DSA Instance [%s]\n" - "\tobjectGUID[%s]\n" "\tinvocationId[%s]\n", settings->ntds_dn_str, - settings->ntds_guid == NULL?"None":GUID_string(mem_ctx, settings->ntds_guid), settings->invocation_id == NULL?"None":GUID_string(mem_ctx, settings->invocation_id))); DEBUG(0,("Pathes under targetdir[%s]\n", diff --git a/source4/param/provision.h b/source4/param/provision.h index 6b5bc798df..af9685d292 100644 --- a/source4/param/provision.h +++ b/source4/param/provision.h @@ -21,7 +21,6 @@ #define _PROVISION_H_ struct provision_settings { - const char *dns_name; const char *site_name; const char *root_dn_str; const char *domain_dn_str; @@ -33,7 +32,6 @@ struct provision_settings { const char *host_ip; const char *realm; const char *domain; - const struct GUID *ntds_guid; const char *ntds_dn_str; const char *machine_password; const char *targetdir; |