[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  2f9076a... s3-libads: use shared well known guids.
       via  b9e6962... s3-libads: move KRB5_ENV_CCNAME to separate header krb5_env.h.
      from  c2e2f78... s4:dsdb/tests/python/passwords.py - add the right result codes for user password changes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2f9076ac29904c98e1a794d04c79db637283f888
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 30 23:09:05 2010 +0200

    s3-libads: use shared well known guids.
    
    Guenther

commit b9e6962dd7616eaeaf8a0bc42c1180541ca06dd3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 30 22:32:00 2010 +0200

    s3-libads: move KRB5_ENV_CCNAME to separate header krb5_env.h.
    
    Guenther

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

Summary of changes:
 source3/include/ads.h      |    6 ------
 source3/include/includes.h |    1 +
 source3/include/krb5_env.h |    2 ++
 source3/libads/ldap.c      |    2 +-
 source3/utils/net_ads.c    |    4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 source3/include/krb5_env.h


Changeset truncated at 500 lines:

diff --git a/source3/include/ads.h b/source3/include/ads.h
index d0bae80..132586f 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -241,12 +241,6 @@ typedef void **ADS_MODLIST;
 #define ADS_AUTH_SASL_FORCE       0x0080
 #define ADS_AUTH_USER_CREDS       0x0100
 
-/* Kerberos environment variable names */
-#define KRB5_ENV_CCNAME "KRB5CCNAME"
-
-#define WELL_KNOWN_GUID_COMPUTERS	"AA312825768811D1ADED00C04FD8D5CD" 
-#define WELL_KNOWN_GUID_USERS		"A9D1CA15768811D1ADED00C04FD8D5CD"
-
 enum ads_extended_dn_flags {
 	ADS_EXTENDED_DN_HEX_STRING	= 0,
 	ADS_EXTENDED_DN_STRING		= 1 /* not supported on win2k */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 02a8494..9c97042 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -626,6 +626,7 @@ extern void *cmdline_lp_ctx;
 #include "../lib/util/time.h"
 #include "../lib/util/asn1.h"
 
+#include "krb5_env.h"
 #include "ads.h"
 #include "ads_dns.h"
 #include "interfaces.h"
diff --git a/source3/include/krb5_env.h b/source3/include/krb5_env.h
new file mode 100644
index 0000000..aa96795
--- /dev/null
+++ b/source3/include/krb5_env.h
@@ -0,0 +1,2 @@
+/* Kerberos environment variable names */
+#define KRB5_ENV_CCNAME "KRB5CCNAME"
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 98da8ff..af48fda 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1602,7 +1602,7 @@ char *ads_ou_string(ADS_STRUCT *ads, const char *org_unit)
 
 	if (!org_unit || !*org_unit) {
 
-		ret = ads_default_ou_string(ads, WELL_KNOWN_GUID_COMPUTERS);
+		ret = ads_default_ou_string(ads, DS_GUID_COMPUTERS_CONTAINER);
 
 		/* samba4 might not yet respond to a wellknownobject-query */
 		return ret ? ret : SMB_STRDUP("cn=Computers");
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 4aea9a7..700d98b 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -476,7 +476,7 @@ static int ads_user_add(struct net_context *c, int argc, const char **argv)
 	if (c->opt_container) {
 		ou_str = SMB_STRDUP(c->opt_container);
 	} else {
-		ou_str = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS);
+		ou_str = ads_default_ou_string(ads, DS_GUID_USERS_CONTAINER);
 	}
 
 	status = ads_add_user_acct(ads, argv[0], ou_str, c->opt_comment);
@@ -770,7 +770,7 @@ static int ads_group_add(struct net_context *c, int argc, const char **argv)
 	if (c->opt_container) {
 		ou_str = SMB_STRDUP(c->opt_container);
 	} else {
-		ou_str = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS);
+		ou_str = ads_default_ou_string(ads, DS_GUID_USERS_CONTAINER);
 	}
 
 	status = ads_add_group_acct(ads, argv[0], ou_str, c->opt_comment);


-- 
Samba Shared Repository