[SCM] Samba Shared Repository - branch master updated
Christian Ambach
ambi at samba.org
Tue Jul 5 11:52:01 MDT 2011
The branch, master has been updated
via 9a3e2d1 s3:smbd fix a compile warning on AIX 5.3
via 14544ce s3:build fix autoconf build on AIX 5.3
via 94f24c4 .gitignore: add AIX WINBIND nss module
via 3d6dafc s3:lib fix non-empty blank lines
via f3088d1 s3:modules fix non-empty blank lines
from f924913 s3: Remove some unused variables
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9a3e2d1c020cd7de3a6074f52dc0911bc0ab6f9b
Author: Christian Ambach <ambi at samba.org>
Date: Tue Jul 5 17:06:27 2011 -0500
s3:smbd fix a compile warning on AIX 5.3
use the correct alias instead of FD directly
Autobuild-User: Christian Ambach <ambi at samba.org>
Autobuild-Date: Tue Jul 5 19:51:42 CEST 2011 on sn-devel-104
commit 14544cede5edb996a077b22949253b6c1dbb3708
Author: Christian Ambach <ambi at samba.org>
Date: Tue Jul 5 17:04:15 2011 -0500
s3:build fix autoconf build on AIX 5.3
using ZLIB_LIBS as dependency made AIX make fail trying to
find -lz as build target
commit 94f24c4abbfa653dc3099f4ec05a94d36426abdd
Author: Christian Ambach <ambi at samba.org>
Date: Tue Jul 5 17:02:23 2011 -0500
.gitignore: add AIX WINBIND nss module
this cleans up git status on AIX after building source3
commit 3d6dafcce1ac38cb0309f3aa3342025893dc656f
Author: Christian Ambach <ambi at samba.org>
Date: Tue Jun 28 18:01:22 2011 +0200
s3:lib fix non-empty blank lines
commit f3088d135ded4a0ad47c754f3429c8e4c4dc7150
Author: Christian Ambach <ambi at samba.org>
Date: Tue Jun 28 14:59:18 2011 +0200
s3:modules fix non-empty blank lines
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
source3/Makefile.in | 6 +++---
source3/lib/afs.c | 6 +++---
source3/modules/gpfs.c | 6 +++---
source3/smbd/vfs.c | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 4bf1bae..309dfad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ examples/VFS/skel_transparent.so
semantic.cache
nsswitch/libnss_winbind.so
nsswitch/libnss_wins.so
+nsswitch/WINBIND
source3/config.cache
source3/config.log
source3/config.status
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f674500..3cfc6fa 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1884,7 +1884,7 @@ bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ $(LIBTALL
$(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(ZLIB_LIBS)
+bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo Linking $@
@$(CC) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
$(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
@@ -3128,14 +3128,14 @@ bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(
$(LIBWBCLIENT_LIBS)
bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
- $(LIB_NONSMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(ZLIB_LIBS)
+ $(LIB_NONSMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo Linking $@
@$(CC) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) $(ZLIB_LIBS) \
$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) @INIPARSERLIBS@
-bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) $(LIBTDB) $(ZLIB_LIBS)
+bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) $(LIBTDB)
@echo "Linking shared library $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \
$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
diff --git a/source3/lib/afs.c b/source3/lib/afs.c
index d73e9df..61a588c 100644
--- a/source3/lib/afs.c
+++ b/source3/lib/afs.c
@@ -1,4 +1,4 @@
-/*
+/*
* Unix SMB/CIFS implementation.
* Generate AFS tickets
* Copyright (C) Volker Lendecke 2003
@@ -7,12 +7,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index d2832ba..5b0d7d0 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -1,4 +1,4 @@
-/*
+/*
* Unix SMB/CIFS implementation.
* Provide a connection to GPFS specific features
* Copyright (C) Volker Lendecke 2005
@@ -7,12 +7,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 7be3867..ed50098 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -729,7 +729,7 @@ const char *vfs_readdirname(connection_struct *conn, void *p,
if (!p)
return(NULL);
- ptr = SMB_VFS_READDIR(conn, (DIR *)p, sbuf);
+ ptr = SMB_VFS_READDIR(conn, (SMB_STRUCT_DIR *)p, sbuf);
if (!ptr)
return(NULL);
--
Samba Shared Repository
More information about the samba-cvs
mailing list