diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-20 17:19:45 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-20 17:19:45 +0200 |
| commit | a11ecbbff0c08f14fa1ce41e41578ff0ff85003a (patch) | |
| tree | 0832ab6a711b44ccb7a8f9b0b2b708a234b6b4a9 | |
| parent | c185e7a29c9d973a3916928903acc078c43b0d4f (diff) | |
| parent | f493755aafacb128cb7b9148898f5ce1d02f6d69 (diff) | |
| download | samba-a11ecbbff0c08f14fa1ce41e41578ff0ff85003a.tar.gz samba-a11ecbbff0c08f14fa1ce41e41578ff0ff85003a.tar.bz2 samba-a11ecbbff0c08f14fa1ce41e41578ff0ff85003a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge-without-netlogond
| -rw-r--r-- | source3/rpc_server/srv_lsa_hnd.c | 2 | ||||
| -rwxr-xr-x | source3/script/installmodules.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c index 21b297af2d..d8c48058be 100644 --- 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 f70db003ed..127091d808 100755 --- 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 |