[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2723-gd7ba98c

[Günther Deschner]

The branch, v3-3-test has been updated
       via  d7ba98cc3f2d037ec01e079220a66da508b104b0 (commit)
       via  420390ba0ef6b45f18a8fd37974b1fbee0bd1502 (commit)
       via  7f8b0b4d151fa4d07758b6fd7b47b0b7c07dda17 (commit)
       via  f8fec49ce10cbd663cb30ac94a543b4a76a8dc57 (commit)
      from  6c80362e291d8c5e748b987a583e8e32acc36354 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit d7ba98cc3f2d037ec01e079220a66da508b104b0
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 4 01:32:15 2008 +0200

    libnetjoin: delete possible "realm" leftover parameter.
    
    Guenther

commit 420390ba0ef6b45f18a8fd37974b1fbee0bd1502
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 4 01:30:37 2008 +0200

    net: print NBT_SERVER_X_SECRET_DOMAIN_6 flags in "net ads lookup".
    
    Guenther

commit 7f8b0b4d151fa4d07758b6fd7b47b0b7c07dda17
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 4 01:29:22 2008 +0200

    util_str: add talloc_asprintf_strlower_m().
    
    Guenther

commit f8fec49ce10cbd663cb30ac94a543b4a76a8dc57
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 3 20:42:58 2008 +0200

    netapi: remove unrequired headers.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/include/proto.h      |    1 +
 source/lib/netapi/samr.c    |    5 -----
 source/lib/util_str.c       |   17 +++++++++++++++++
 source/libnet/libnet_join.c |    2 ++
 source/utils/net_ads.c      |    9 +++++++--
 5 files changed, 27 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index e8a2b69..582300b 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1730,6 +1730,7 @@ void sprintf_append(TALLOC_CTX *mem_ctx, char **string, ssize_t *len,
 		    size_t *bufsize, const char *fmt, ...);
 int asprintf_strupper_m(char **strp, const char *fmt, ...);
 char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...);
+char *talloc_asprintf_strlower_m(TALLOC_CTX *t, const char *fmt, ...);
 char *sstring_sub(const char *src, char front, char back);
 bool validate_net_name( const char *name,
 		const char *invalid_chars,
diff --git a/source/lib/netapi/samr.c b/source/lib/netapi/samr.c
index 8289890..2346f7f 100644
--- a/source/lib/netapi/samr.c
+++ b/source/lib/netapi/samr.c
@@ -19,11 +19,6 @@
 
 #include "includes.h"
 
-#include "librpc/gen_ndr/libnetapi.h"
-#include "lib/netapi/netapi.h"
-#include "lib/netapi/netapi_private.h"
-#include "lib/netapi/libnetapi.h"
-
 /****************************************************************
 ****************************************************************/
 
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 5a08f7b..1e11081 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -2615,6 +2615,23 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...)
 	return ret;
 }
 
+char *talloc_asprintf_strlower_m(TALLOC_CTX *t, const char *fmt, ...)
+{
+	va_list ap;
+	char *ret;
+
+	va_start(ap, fmt);
+	ret = talloc_vasprintf(t, fmt, ap);
+	va_end(ap);
+
+	if (ret == NULL) {
+		return NULL;
+	}
+	strlower_m(ret);
+	return ret;
+}
+
+
 /*
    Returns the substring from src between the first occurrence of
    the char "front" and the first occurence of the char "back".
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 6426dc3..d0ecd22 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1248,6 +1248,8 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
 
 		werr = smbconf_set_global_parameter(ctx, "workgroup",
 						    r->in.domain_name);
+
+		smbconf_delete_global_parameter(ctx, "realm");
 		goto done;
 	}
 
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 8053b24..db2021f 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -117,7 +117,9 @@ static int net_ads_cldap_netlogon(struct net_context *c, ADS_STRUCT *ads)
 		 "\tIs the closest DC:                          %s\n"
 		 "\tIs writable:                                %s\n"
 		 "\tHas a hardware clock:                       %s\n"
-		 "\tIs a non-domain NC serviced by LDAP server: %s\n",
+		 "\tIs a non-domain NC serviced by LDAP server: %s\n"
+		 "\tIs NT6 DC that has some secrets:            %s\n"
+		 "\tIs NT6 DC that has all secrets:             %s\n",
 		 (reply.server_type & NBT_SERVER_PDC) ? "yes" : "no",
 		 (reply.server_type & NBT_SERVER_GC) ? "yes" : "no",
 		 (reply.server_type & NBT_SERVER_LDAP) ? "yes" : "no",
@@ -127,7 +129,10 @@ static int net_ads_cldap_netlogon(struct net_context *c, ADS_STRUCT *ads)
 		 (reply.server_type & NBT_SERVER_CLOSEST) ? "yes" : "no",
 		 (reply.server_type & NBT_SERVER_WRITABLE) ? "yes" : "no",
 		 (reply.server_type & NBT_SERVER_GOOD_TIMESERV) ? "yes" : "no",
-		 (reply.server_type & DS_SERVER_NDNC) ? "yes" : "no");
+		 (reply.server_type & NBT_SERVER_NDNC) ? "yes" : "no",
+		 (reply.server_type & NBT_SERVER_SELECT_SECRET_DOMAIN_6) ? "yes" : "no",
+		 (reply.server_type & NBT_SERVER_FULL_SECRET_DOMAIN_6) ? "yes" : "no");
+
 
 	printf("Forest:\t\t\t%s\n", reply.forest);
 	printf("Domain:\t\t\t%s\n", reply.dns_domain);


-- 
Samba Shared Repository