[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Aug 9 07:20:03 MDT 2011


The branch, master has been updated
       via  46eacae script/librelease.sh: add git push for the release tag
       via  857ad72 ndr_drsuapi: fix compiler warning
      from  e2733d3 s4-dsdb clarify that failure to load the schema items from DRS is expected

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


- Log -----------------------------------------------------------------
commit 46eacae8b516c0a2b9c372af0baadc436f64d957
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 9 13:51:08 2011 +0200

    script/librelease.sh: add git push for the release tag
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Aug  9 15:19:07 CEST 2011 on sn-devel-104

commit 857ad72cac5291ff860b49f0b4a77b7f0ebb32be
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 9 12:40:55 2011 +0200

    ndr_drsuapi: fix compiler warning
    
    metze

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

Summary of changes:
 librpc/ndr/ndr_drsuapi.c |    5 +++--
 script/librelease.sh     |    7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_drsuapi.c b/librpc/ndr/ndr_drsuapi.c
index 852153a..f7125e6 100644
--- a/librpc/ndr/ndr_drsuapi.c
+++ b/librpc/ndr/ndr_drsuapi.c
@@ -101,7 +101,7 @@ static void _print_drsuapi_DsAttributeValue_attid(struct ndr_print *ndr, const c
 static void _print_drsuapi_DsAttributeValue_str(struct ndr_print *ndr, const char *name,
 						const struct drsuapi_DsAttributeValue *r)
 {
-	char *str;
+	void *p;
 	size_t converted_size = 0;
 
 	ndr_print_struct(ndr, name, "drsuapi_DsAttributeValue");
@@ -110,9 +110,10 @@ static void _print_drsuapi_DsAttributeValue_str(struct ndr_print *ndr, const cha
 	                           CH_UTF16, CH_UNIX,
 	                           r->blob->data,
 	                           r->blob->length,
-	                           (void **)&str, &converted_size)) {
+	                           &p, &converted_size)) {
 		ndr_print_string(ndr, "string", "INVALID CONVERSION");
 	} else {
+		char *str = (char *)p;
 		ndr_print_string(ndr, "string", str);
 		talloc_free(str);
 	}
diff --git a/script/librelease.sh b/script/librelease.sh
index 6125236..089b371 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -61,7 +61,12 @@ release_lib() {
 	exit 1
     }
 
-    echo "Transferring"
+    echo "Push git tag $tagname"
+    git push ssh://git.samba.org/data/git/samba.git refs/tags/$tagname:refs/tags/$tagname || {
+	exit 1
+    }
+
+    echo "Transferring for FTP"
     rsync -Pav $tarname.asc $tgzname master.samba.org:~ftp/pub/$lib/ || {
 	exit 1
     }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list