Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge...

diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c
index 21b297af2dabf462905cbd790eb073851321b876..d8c48058be9197f589f1f176dd1aee2b981d7f60 100644 (file)
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -337,7 +337,7 @@ void *_policy_handle_create(struct pipes_struct *p, struct policy_handle *hnd,
                *pstatus = NT_STATUS_NO_MEMORY;
                return NULL;
        }
-       talloc_set_name(data, "%s", type);
+       talloc_set_name_const(data, type);
 
        pol = create_policy_hnd_internal(p, hnd, data);
        if (pol == NULL) {

diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh
index f70db003ede38c8cd4b22edcbc033d991779b5fa..127091d8088e27b9f2ab35236fa85a6fc76cc5b1 100755 (executable)
--- a/source3/script/installmodules.sh
+++ b/source3/script/installmodules.sh
@@ -29,6 +29,11 @@ mtype=`basename $LIBDIR`
 for p in $*; do
  p2=`basename $p`
  name=`echo $p2 | sed -es/${mtype}_//`
+ echo Preserving old module as $DESTDIR/$LIBDIR/$name.old
+ if [ -f $DESTDIR/$LIBDIR/$name ]; then
+   rm -f $DESTDIR/$LIBDIR/$name.old
+   mv $DESTDIR/$LIBDIR/$name $DESTDIR/$LIBDIR/$name.old
+ fi
  echo Installing $p as $DESTDIR/$LIBDIR/$name
  cp -f $p $DESTDIR/$LIBDIR/$name
  chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$name