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

Günther Deschner gd at samba.org
Fri Jul 18 14:43:52 GMT 2008


The branch, v3-3-test has been updated
       via  b0c44d7e6cf321f84bd7b9cdb25635304bbfea81 (commit)
       via  5136daec0a35e7f099477409009672ddd960b684 (commit)
       via  04b1847f87d166819dfe0f8c27c8cd9fc062544f (commit)
       via  0122e4941db33f149a64d7e17286c0ba81247a19 (commit)
       via  f1cc39e3759357344cb7abcb6bfa9d3e3f4969e6 (commit)
      from  1ee2ad1051e6076709ef8ed2f45bebff10b0c3cf (commit)

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


- Log -----------------------------------------------------------------
commit b0c44d7e6cf321f84bd7b9cdb25635304bbfea81
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 18 01:39:27 2008 +0200

    netapi: typo in NetGroupEnum example code.
    
    Guenther

commit 5136daec0a35e7f099477409009672ddd960b684
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 18 16:42:07 2008 +0200

    netapi: fix build warning for ConvertSidToStringSid().
    
    Guenther

commit 04b1847f87d166819dfe0f8c27c8cd9fc062544f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 18 16:41:34 2008 +0200

    kerberos: make smb_krb5_kt_add_entry() static.
    
    Guenther

commit 0122e4941db33f149a64d7e17286c0ba81247a19
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 18 16:39:24 2008 +0200

    libads: add prototype for ads_connect_gc().
    
    Guenther

commit f1cc39e3759357344cb7abcb6bfa9d3e3f4969e6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 18 16:29:05 2008 +0200

    libnetjoin: make libnet_join_rollback() static.
    
    Guenther

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

Summary of changes:
 source/include/proto.h                        |    1 +
 source/lib/netapi/examples/group/group_enum.c |    2 +-
 source/lib/netapi/sid.c                       |    6 +++---
 source/libads/kerberos_keytab.c               |   12 ++++++------
 source/libnet/libnet_join.c                   |    4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index 209bc07..c204a94 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -2070,6 +2070,7 @@ bool ads_sitename_match(ADS_STRUCT *ads);
 bool ads_closest_dc(ADS_STRUCT *ads);
 ADS_STATUS ads_connect(ADS_STRUCT *ads);
 ADS_STATUS ads_connect_user_creds(ADS_STRUCT *ads);
+ADS_STATUS ads_connect_gc(ADS_STRUCT *ads);
 void ads_disconnect(ADS_STRUCT *ads);
 ADS_STATUS ads_do_search_all_fn(ADS_STRUCT *ads, const char *bind_path,
 				int scope, const char *expr, const char **attrs,
diff --git a/source/lib/netapi/examples/group/group_enum.c b/source/lib/netapi/examples/group/group_enum.c
index a9b6ad9..fe2aee1 100644
--- a/source/lib/netapi/examples/group/group_enum.c
+++ b/source/lib/netapi/examples/group/group_enum.c
@@ -75,7 +75,7 @@ int main(int argc, const char **argv)
 		level = atoi(poptGetArg(pc));
 	}
 
-	/* NetUserEnum */
+	/* NetGroupEnum */
 
 	do {
 		status = NetGroupEnum(hostname,
diff --git a/source/lib/netapi/sid.c b/source/lib/netapi/sid.c
index 869bd0f..4db98bf 100644
--- a/source/lib/netapi/sid.c
+++ b/source/lib/netapi/sid.c
@@ -19,13 +19,13 @@
 
 #include "includes.h"
 
-#include "librpc/gen_ndr/libnetapi.h"
+#include "lib/netapi/netapi.h"
 
 /****************************************************************
 ****************************************************************/
 
-bool ConvertSidToStringSid(const struct domsid *sid,
-			   char **sid_string)
+int ConvertSidToStringSid(const struct domsid *sid,
+			  char **sid_string)
 {
 	char *ret;
 
diff --git a/source/libads/kerberos_keytab.c b/source/libads/kerberos_keytab.c
index b905cb4..87b8555 100644
--- a/source/libads/kerberos_keytab.c
+++ b/source/libads/kerberos_keytab.c
@@ -212,12 +212,12 @@ out:
 	return (int)ret;
 }
 
-int smb_krb5_kt_add_entry(krb5_context context,
-			  krb5_keytab keytab,
-			  krb5_kvno kvno,
-			  const char *princ_s,
-			  krb5_enctype *enctypes,
-			  krb5_data password)
+static int smb_krb5_kt_add_entry(krb5_context context,
+				 krb5_keytab keytab,
+				 krb5_kvno kvno,
+				 const char *princ_s,
+				 krb5_enctype *enctypes,
+				 krb5_data password)
 {
 	return smb_krb5_kt_add_entry_ext(context,
 					 keytab,
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 6b6491b..bb21bc4 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1733,8 +1733,8 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-WERROR libnet_join_rollback(TALLOC_CTX *mem_ctx,
-			    struct libnet_JoinCtx *r)
+static WERROR libnet_join_rollback(TALLOC_CTX *mem_ctx,
+				   struct libnet_JoinCtx *r)
 {
 	WERROR werr;
 	struct libnet_UnjoinCtx *u = NULL;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list