[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-1356-ge6bd139
Stefan Metzmacher
metze at samba.org
Tue Jan 15 09:45:14 GMT 2008
The branch, v3-2-test has been updated
via e6bd1395f2c1da7bcf1a31cdb297919ed6a15469 (commit)
via 7cb81bfc6bcdd56a8886e18aa9a7e05ec963d33d (commit)
via 7dd65599a15bf1d164fcfa554c8057d43c51eb6d (commit)
from 9f05d2eae7c55d39ad61da54c4a38d6b6f8d4d3a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e6bd1395f2c1da7bcf1a31cdb297919ed6a15469
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 15 10:43:24 2008 +0100
libwbclient: add wbclient.pc.in
metze
commit 7cb81bfc6bcdd56a8886e18aa9a7e05ec963d33d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 15 10:42:03 2008 +0100
libwbclient: install wbclient.h into the same path as smbclient.h
metze
commit 7dd65599a15bf1d164fcfa554c8057d43c51eb6d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 15 10:24:09 2008 +0100
libwbclient: move wbc_err.h into wbclient.h as we only install one header
This makes the installed wbclient.h header usable.
metze
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 5 ++-
source/configure.in | 5 ++-
source/nsswitch/libwbclient/wbc_err.h | 51 --------------------------------
source/nsswitch/libwbclient/wbclient.h | 27 ++++++++++++++++-
source/pkgconfig/wbclient.pc.in | 13 ++++++++
5 files changed, 46 insertions(+), 55 deletions(-)
delete mode 100644 source/nsswitch/libwbclient/wbc_err.h
create mode 100644 source/pkgconfig/wbclient.pc.in
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index c34f328..3918d29 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1884,9 +1884,10 @@ installlibaddns: installdirs libaddns
-$(INSTALLLIBCMD_A) bin/libaddns.a $(DESTDIR)$(LIBDIR)
installlibwbclient: installdirs libwbclient
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) $(INCLUDEDIR)/samba
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/libwbclient. at SHLIBEXT@ $(DESTDIR)$(LIBDIR)
- -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include/samba
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include
installlibnetapi: installdirs libnetapi
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
diff --git a/source/configure.in b/source/configure.in
index 4222d93..98f5c45 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -6656,7 +6656,10 @@ AC_SUBST(SMBD_LIBS)
AC_OUTPUT(Makefile library-versions
script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh
lib/netapi/examples/Makefile
- pkgconfig/smbclient.pc pkgconfig/netapi.pc pkgconfig/smbsharemodes.pc
+ pkgconfig/smbclient.pc
+ pkgconfig/wbclient.pc
+ pkgconfig/netapi.pc
+ pkgconfig/smbsharemodes.pc
)
#################################################
diff --git a/source/nsswitch/libwbclient/wbc_err.h b/source/nsswitch/libwbclient/wbc_err.h
deleted file mode 100644
index 069f68f..0000000
--- a/source/nsswitch/libwbclient/wbc_err.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Winbind client API
-
- Copyright (C) Gerald (Jerry) Carter 2007
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _WBC_ERR_H
-#define _WBC_ERR_H
-
-
-/* Define error types */
-
-/**
- * @brief Status codes returned from wbc functions
- **/
-
-enum _wbcErrType {
- WBC_ERR_SUCCESS = 0, /**< Successful completion **/
- WBC_ERR_NOT_IMPLEMENTED,/**< Function not implemented **/
- WBC_ERR_UNKNOWN_FAILURE,/**< General failure **/
- WBC_ERR_NO_MEMORY, /**< Memory allocation error **/
- WBC_ERR_INVALID_SID, /**< Invalid SID format **/
- WBC_ERR_INVALID_PARAM, /**< An Invalid parameter was supplied **/
- WBC_ERR_WINBIND_NOT_AVAILABLE, /**< Winbind daemon is not available **/
- WBC_ERR_DOMAIN_NOT_FOUND, /**< Domain is not trusted or cannot be found **/
- WBC_INVALID_RESPONSE, /**< Winbind returned an invalid response **/
- WBC_ERR_NSS_ERROR /**< NSS_STATUS error **/
-};
-
-typedef enum _wbcErrType wbcErr;
-
-#define WBC_ERROR_IS_OK(x) ((x) == WBC_ERR_SUCCESS)
-
-char *wbcErrorString(wbcErr error);
-
-#endif /* _WBC_ERR_H */
diff --git a/source/nsswitch/libwbclient/wbclient.h b/source/nsswitch/libwbclient/wbclient.h
index 6b85d7e..0b256d3 100644
--- a/source/nsswitch/libwbclient/wbclient.h
+++ b/source/nsswitch/libwbclient/wbclient.h
@@ -23,7 +23,32 @@
#define _WBCLIENT_H
#include <pwd.h>
-#include <nsswitch/libwbclient/wbc_err.h>
+#include <grp.h>
+
+/* Define error types */
+
+/**
+ * @brief Status codes returned from wbc functions
+ **/
+
+enum _wbcErrType {
+ WBC_ERR_SUCCESS = 0, /**< Successful completion **/
+ WBC_ERR_NOT_IMPLEMENTED,/**< Function not implemented **/
+ WBC_ERR_UNKNOWN_FAILURE,/**< General failure **/
+ WBC_ERR_NO_MEMORY, /**< Memory allocation error **/
+ WBC_ERR_INVALID_SID, /**< Invalid SID format **/
+ WBC_ERR_INVALID_PARAM, /**< An Invalid parameter was supplied **/
+ WBC_ERR_WINBIND_NOT_AVAILABLE, /**< Winbind daemon is not available **/
+ WBC_ERR_DOMAIN_NOT_FOUND, /**< Domain is not trusted or cannot be found **/
+ WBC_INVALID_RESPONSE, /**< Winbind returned an invalid response **/
+ WBC_ERR_NSS_ERROR /**< NSS_STATUS error **/
+};
+
+typedef enum _wbcErrType wbcErr;
+
+#define WBC_ERROR_IS_OK(x) ((x) == WBC_ERR_SUCCESS)
+
+char *wbcErrorString(wbcErr error);
/*
* Data types used by the Winbind Client API
diff --git a/source/pkgconfig/wbclient.pc.in b/source/pkgconfig/wbclient.pc.in
new file mode 100644
index 0000000..158fa92
--- /dev/null
+++ b/source/pkgconfig/wbclient.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Samba libwbclient
+Description: A library to access winbindd
+Version: 0
+URL: http://www.samba.org/
+#Libs: -L at libdir@ -lwbclient
+Libs: -lwbclient
+Libs.private: -lwbclient
+Cflags: -I at includedir@
--
Samba Shared Repository
More information about the samba-cvs
mailing list