[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Feb 24 17:56:01 MST 2011
The branch, master has been updated
via bc13123 s3-libads: make ndr_print_ads_auth_flags() static.
via 59e45a9 s3-vfs: make syncops_connect in modules/vfs_syncops.c static.
via 313db81 s3-errormap: move (unused) map_nt_error_from_wbcErr out of errormap.
via de8b373 s3-printing: move more printing defines out of includes.h
from ed3ae87 Implement the SMB2 close flag SMB2_CLOSE_FLAGS_FULL_INFORMATION (and move definition to correct place).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bc1312303dd2de401f3c6bd93a705ab1bfe07b56
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 24 23:38:18 2011 +0100
s3-libads: make ndr_print_ads_auth_flags() static.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Fri Feb 25 01:55:26 CET 2011 on sn-devel-104
commit 59e45a979ca49b485bc5a88d79d1ce83b80d5bee
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 24 23:04:40 2011 +0100
s3-vfs: make syncops_connect in modules/vfs_syncops.c static.
Guenther
commit 313db81ad3de6cf7759d6a0fc21ee32419b2e62b
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 24 22:29:16 2011 +0100
s3-errormap: move (unused) map_nt_error_from_wbcErr out of errormap.
Guenther
commit de8b373329931c921d95bf4f622d5713675288d9
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 24 12:03:19 2011 +0100
s3-printing: move more printing defines out of includes.h
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/includes.h | 30 -------------------
source3/include/printing.h | 30 +++++++++++++++++++
source3/include/proto.h | 1 -
source3/libads/ads_proto.h | 2 +-
source3/libads/ndr.c | 2 +-
source3/libsmb/errormap.c | 39 -------------------------
source3/libsmb/errormap_wbc.c | 63 +++++++++++++++++++++++++++++++++++++++++
source3/libsmb/errormap_wbc.h | 3 ++
source3/modules/vfs_syncops.c | 4 +-
9 files changed, 100 insertions(+), 74 deletions(-)
create mode 100644 source3/libsmb/errormap_wbc.c
create mode 100644 source3/libsmb/errormap_wbc.h
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 348dda1..2d6e1e7 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -53,19 +53,6 @@
#include "local.h"
-#ifdef AIX
-#define DEFAULT_PRINTING PRINT_AIX
-#define PRINTCAP_NAME "/etc/qconfig"
-#endif
-
-#ifdef HPUX
-#define DEFAULT_PRINTING PRINT_HPUX
-#endif
-
-#ifdef QNX
-#define DEFAULT_PRINTING PRINT_QNX
-#endif
-
#ifdef SUNOS4
/* on SUNOS4 termios.h conflicts with sys/ioctl.h */
#undef HAVE_TERMIOS_H
@@ -705,23 +692,6 @@ enum flush_reason_enum {
/* prototypes from lib/util_transfer_file.c */
#include "transfer_file.h"
-#ifndef DEFAULT_PRINTING
-#ifdef HAVE_CUPS
-#define DEFAULT_PRINTING PRINT_CUPS
-#define PRINTCAP_NAME "cups"
-#elif defined(SYSV)
-#define DEFAULT_PRINTING PRINT_SYSV
-#define PRINTCAP_NAME "lpstat"
-#else
-#define DEFAULT_PRINTING PRINT_BSD
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-#endif
-
-#ifndef PRINTCAP_NAME
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-
#ifndef SIGCLD
#define SIGCLD SIGCHLD
#endif
diff --git a/source3/include/printing.h b/source3/include/printing.h
index 72c9cef..3752b9c 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -125,6 +125,36 @@ extern struct printif iprint_printif;
#endif
#define PRINT_DATABASE_VERSION 7
+#ifdef AIX
+#define DEFAULT_PRINTING PRINT_AIX
+#define PRINTCAP_NAME "/etc/qconfig"
+#endif
+
+#ifdef HPUX
+#define DEFAULT_PRINTING PRINT_HPUX
+#endif
+
+#ifdef QNX
+#define DEFAULT_PRINTING PRINT_QNX
+#endif
+
+#ifndef DEFAULT_PRINTING
+#ifdef HAVE_CUPS
+#define DEFAULT_PRINTING PRINT_CUPS
+#define PRINTCAP_NAME "cups"
+#elif defined(SYSV)
+#define DEFAULT_PRINTING PRINT_SYSV
+#define PRINTCAP_NAME "lpstat"
+#else
+#define DEFAULT_PRINTING PRINT_BSD
+#define PRINTCAP_NAME "/etc/printcap"
+#endif
+#endif
+
+#ifndef PRINTCAP_NAME
+#define PRINTCAP_NAME "/etc/printcap"
+#endif
+
/* There can be this many printing tdb's open, plus any locked ones. */
#define MAX_PRINT_DBS_OPEN 1
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fe4a2c1..ae048af 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2602,7 +2602,6 @@ NTSTATUS dos_to_ntstatus(uint8 eclass, uint32 ecode);
void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode);
NTSTATUS werror_to_ntstatus(WERROR error);
WERROR ntstatus_to_werror(NTSTATUS error);
-NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err);
NTSTATUS map_nt_error_from_gss(uint32 gss_maj, uint32 minor);
/* The following definitions come from libsmb/namecache.c */
diff --git a/source3/libads/ads_proto.h b/source3/libads/ads_proto.h
index 040825e..ed702de 100644
--- a/source3/libads/ads_proto.h
+++ b/source3/libads/ads_proto.h
@@ -133,7 +133,7 @@ ADS_STATUS ads_ranged_search(ADS_STRUCT *ads,
/* The following definitions come from libads/ndr.c */
-void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r);
+struct ndr_print;
void ndr_print_ads_struct(struct ndr_print *ndr, const char *name, const struct ads_struct *r);
/* The following definitions come from libads/sasl.c */
diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c
index 603add0..c6b1121 100644
--- a/source3/libads/ndr.c
+++ b/source3/libads/ndr.c
@@ -24,7 +24,7 @@
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "librpc/ndr/util.h"
-void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r)
+static void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r)
{
ndr_print_uint32(ndr, name, r);
ndr->depth++;
diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c
index babe6b9..71efff3 100644
--- a/source3/libsmb/errormap.c
+++ b/source3/libsmb/errormap.c
@@ -1506,45 +1506,6 @@ WERROR ntstatus_to_werror(NTSTATUS error)
return W_ERROR(NT_STATUS_V(error) & 0xffff);
}
-/*******************************************************************************
- Map between wbcErr and NT status.
-*******************************************************************************/
-
-static const struct {
- wbcErr wbc_err;
- NTSTATUS nt_status;
-} wbcErr_ntstatus_map[] = {
- { WBC_ERR_SUCCESS, NT_STATUS_OK },
- { WBC_ERR_NOT_IMPLEMENTED, NT_STATUS_NOT_IMPLEMENTED },
- { WBC_ERR_UNKNOWN_FAILURE, NT_STATUS_UNSUCCESSFUL },
- { WBC_ERR_NO_MEMORY, NT_STATUS_NO_MEMORY },
- { WBC_ERR_INVALID_SID, NT_STATUS_INVALID_SID },
- { WBC_ERR_INVALID_PARAM, NT_STATUS_INVALID_PARAMETER },
- { WBC_ERR_WINBIND_NOT_AVAILABLE, NT_STATUS_SERVER_DISABLED },
- { WBC_ERR_DOMAIN_NOT_FOUND, NT_STATUS_NO_SUCH_DOMAIN },
- { WBC_ERR_INVALID_RESPONSE, NT_STATUS_INVALID_NETWORK_RESPONSE },
- { WBC_ERR_NSS_ERROR, NT_STATUS_INTERNAL_ERROR },
- { WBC_ERR_AUTH_ERROR, NT_STATUS_LOGON_FAILURE },
- { WBC_ERR_UNKNOWN_USER, NT_STATUS_NO_SUCH_USER },
- { WBC_ERR_UNKNOWN_GROUP, NT_STATUS_NO_SUCH_GROUP },
- { WBC_ERR_PWD_CHANGE_FAILED, NT_STATUS_PASSWORD_RESTRICTION }
-};
-
-NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err)
-{
- int i;
-
- /* Look through list */
- for (i=0;i<ARRAY_SIZE(wbcErr_ntstatus_map);i++) {
- if (wbcErr_ntstatus_map[i].wbc_err == wbc_err) {
- return wbcErr_ntstatus_map[i].nt_status;
- }
- }
-
- /* Default return */
- return NT_STATUS_UNSUCCESSFUL;
-}
-
#if defined(HAVE_GSSAPI)
/*******************************************************************************
diff --git a/source3/libsmb/errormap_wbc.c b/source3/libsmb/errormap_wbc.c
new file mode 100644
index 0000000..b7e6ec0
--- /dev/null
+++ b/source3/libsmb/errormap_wbc.c
@@ -0,0 +1,63 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * error mapping functions
+ * Copyright (C) Andrew Tridgell 2001
+ * Copyright (C) Andrew Bartlett 2001
+ * Copyright (C) Tim Potter 2000
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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/>.
+ */
+
+#include "includes.h"
+#include "nsswitch/libwbclient/wbclient.h"
+
+/*******************************************************************************
+ Map between wbcErr and NT status.
+*******************************************************************************/
+
+static const struct {
+ wbcErr wbc_err;
+ NTSTATUS nt_status;
+} wbcErr_ntstatus_map[] = {
+ { WBC_ERR_SUCCESS, NT_STATUS_OK },
+ { WBC_ERR_NOT_IMPLEMENTED, NT_STATUS_NOT_IMPLEMENTED },
+ { WBC_ERR_UNKNOWN_FAILURE, NT_STATUS_UNSUCCESSFUL },
+ { WBC_ERR_NO_MEMORY, NT_STATUS_NO_MEMORY },
+ { WBC_ERR_INVALID_SID, NT_STATUS_INVALID_SID },
+ { WBC_ERR_INVALID_PARAM, NT_STATUS_INVALID_PARAMETER },
+ { WBC_ERR_WINBIND_NOT_AVAILABLE, NT_STATUS_SERVER_DISABLED },
+ { WBC_ERR_DOMAIN_NOT_FOUND, NT_STATUS_NO_SUCH_DOMAIN },
+ { WBC_ERR_INVALID_RESPONSE, NT_STATUS_INVALID_NETWORK_RESPONSE },
+ { WBC_ERR_NSS_ERROR, NT_STATUS_INTERNAL_ERROR },
+ { WBC_ERR_AUTH_ERROR, NT_STATUS_LOGON_FAILURE },
+ { WBC_ERR_UNKNOWN_USER, NT_STATUS_NO_SUCH_USER },
+ { WBC_ERR_UNKNOWN_GROUP, NT_STATUS_NO_SUCH_GROUP },
+ { WBC_ERR_PWD_CHANGE_FAILED, NT_STATUS_PASSWORD_RESTRICTION }
+};
+
+NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err)
+{
+ int i;
+
+ /* Look through list */
+ for (i=0;i<ARRAY_SIZE(wbcErr_ntstatus_map);i++) {
+ if (wbcErr_ntstatus_map[i].wbc_err == wbc_err) {
+ return wbcErr_ntstatus_map[i].nt_status;
+ }
+ }
+
+ /* Default return */
+ return NT_STATUS_UNSUCCESSFUL;
+}
+
diff --git a/source3/libsmb/errormap_wbc.h b/source3/libsmb/errormap_wbc.h
new file mode 100644
index 0000000..2042da4
--- /dev/null
+++ b/source3/libsmb/errormap_wbc.h
@@ -0,0 +1,3 @@
+/* The following definitions come from libsmb/errormap_wbc.c */
+
+NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err);
diff --git a/source3/modules/vfs_syncops.c b/source3/modules/vfs_syncops.c
index 76072ab..d5770d0 100644
--- a/source3/modules/vfs_syncops.c
+++ b/source3/modules/vfs_syncops.c
@@ -242,8 +242,8 @@ static int syncops_close(vfs_handle_struct *handle, files_struct *fsp)
return SMB_VFS_NEXT_CLOSE(handle, fsp);
}
-int syncops_connect(struct vfs_handle_struct *handle, const char *service,
- const char *user)
+static int syncops_connect(struct vfs_handle_struct *handle, const char *service,
+ const char *user)
{
struct syncops_config_data *config;
--
Samba Shared Repository
More information about the samba-cvs
mailing list