[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  a325e7b s3: Fix bug 8695
       via  43b7038 RHEL-CTDB: *.msg files moved
       via  077e5bc RHEL-CTDB: *.dat files moved
       via  29c2422 RHEL-CTDB: CP*so are no more
       via  2a1a276 RHEL-CTDB: --with-mandir -> --mandir
      from  e9874bd dynconfig: overwrite --with-privatelibdir as a Samba option

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


- Log -----------------------------------------------------------------
commit a325e7b560502ce43c78a7c6c8d692e872f262ae
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 17 17:14:38 2012 +0100

    s3: Fix bug 8695
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue Jan 17 18:55:01 CET 2012 on sn-devel-104

commit 43b7038dead78fae022a3f145582a25684538266
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 17 14:21:30 2012 +0100

    RHEL-CTDB: *.msg files moved

commit 077e5bc5564fdda230c78e812bae767aa3c719bf
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 17 14:21:30 2012 +0100

    RHEL-CTDB: *.dat files moved

commit 29c2422bb4fb7b71611d586c6217b23e6a545509
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 17 14:21:30 2012 +0100

    RHEL-CTDB: CP*so are no more

commit 2a1a2766bb3318e0deb1f319de2d647cc2bf0651
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 17 14:21:30 2012 +0100

    RHEL-CTDB: --with-mandir -> --mandir

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

Summary of changes:
 packaging/RHEL-CTDB/configure.rpm   |    2 +-
 packaging/RHEL-CTDB/samba.spec.tmpl |   12 +++++-------
 source3/param/loadparm.c            |    1 +
 3 files changed, 7 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index fafad81..c2a0302 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -35,7 +35,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
 	--with-pammodulesdir=/${_libarch}/security \
 	--with-lockdir=/var/lib/samba \
 	--with-logfilebase=/var/log/samba \
-	--with-mandir=${_mandir} \
+	--mandir=${_mandir} \
 	--with-piddir=/var/run \
 	--with-privatedir=${_sysconfdir}/samba \
 	--with-sambabook=${_datadir}/swat/using_samba \
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index fae9ffe..67d4eef 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -170,7 +170,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
 	--with-pammodulesdir=%{_libarch}/security \
         --with-lockdir=/var/lib/samba \
         --with-logfilebase=/var/log/samba \
-        --with-mandir=%{_mandir} \
+        --mandir=%{_mandir} \
         --with-piddir=/var/run \
 	--with-privatedir=%{_sysconfdir}/samba \
         --with-sambabook=%{_datadir}/swat/using_samba \
@@ -480,7 +480,7 @@ exit 0
 %{_datadir}/swat/*
 %{_sbindir}/swat
 %{_mandir}/man8/swat.8*
-%attr(755,root,root) %{_libarchdir}/samba/*.msg
+%attr(755,root,root) /usr/share/codepages/*.msg
 
 ##########
 
@@ -538,18 +538,16 @@ exit 0
 /usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
 /usr/share/locale/*/LC_MESSAGES/net.mo
 
-%{_libarchdir}/samba/charset/CP437.so
-%{_libarchdir}/samba/charset/CP850.so
 %{_libarchdir}/samba/idmap/ad.so
 %{_libarchdir}/samba/idmap/rid.so
 %{_libarchdir}/samba/idmap/tdb2.so
 %{_libarchdir}/samba/idmap/autorid.so
-%{_libarchdir}/samba/lowcase.dat
 %{_libarchdir}/samba/nss_info/rfc2307.so
 %{_libarchdir}/samba/nss_info/sfu.so
 %{_libarchdir}/samba/nss_info/sfu20.so
-%{_libarchdir}/samba/upcase.dat
-%{_libarchdir}/samba/valid.dat
+/usr/share/codepages/lowcase.dat
+/usr/share/codepages/upcase.dat
+/usr/share/codepages/valid.dat
 
 %{_includedir}/libsmbclient.h
 %{_libarchdir}/libsmbclient.*
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2ab32f8..0c769e6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6474,6 +6474,7 @@ static void copy_service(struct loadparm_service *pserviceDest, struct loadparm_
 				case P_INTEGER:
 				case P_ENUM:
 				case P_OCTAL:
+				case P_BYTES:
 					*(int *)dest_ptr = *(int *)src_ptr;
 					break;
 


-- 
Samba Shared Repository