The branch, v3-6-test has been updated
via 43967ee tdb: fix a build warning.
via 52cbf2f libcli/security: fix build warning, cr_descr_log_acl() is
not used currently.
via 68db6bb s3-spoolss: remove unused struct in
construct_notify_printer_info().
via dc1219f s3-proto: remove some duplicate prototypes.
from 922b6a8 s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 43967ee75962fc135fbc045bab87b642947eb644
Author: Günther Deschner <g...@samba.org>
Date: Thu May 5 12:52:05 2011 +0200
tdb: fix a build warning.
Guenther
(cherry picked from commit 73c31f044e32103276558a194698ea6cf876b4f2)
commit 52cbf2f1d671589d2c1d48f3f52fd2f667af02ba
Author: Günther Deschner <g...@samba.org>
Date: Thu May 5 12:52:29 2011 +0200
libcli/security: fix build warning, cr_descr_log_acl() is not used
currently.
Guenther
(cherry picked from commit 03b9a9938b934ff774ad49c5b409c7060e66b999)
commit 68db6bb3d0df017b2ba60b03d585ccdf74558116
Author: Günther Deschner <g...@samba.org>
Date: Thu May 5 21:52:57 2011 +0200
s3-spoolss: remove unused struct in construct_notify_printer_info().
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Fri May 6 12:07:17 CEST 2011 on sn-devel-104
(cherry picked from commit ab8219a6f39360da742d0f3ca702f2173d798538)
commit dc1219fec7187061f3fda96b157bd7946693ff6e
Author: Günther Deschner <g...@samba.org>
Date: Fri May 6 14:03:00 2011 +0200
s3-proto: remove some duplicate prototypes.
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Fri May 6 16:21:08 CEST 2011 on sn-devel-104
(cherry picked from commit 41134f7f4bb6cd2ff84422782dfb82845d881950)
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/pytdb.c | 1 +
libcli/security/create_descriptor.c | 2 +
source3/include/proto.h | 54 ---------------------------
source3/rpc_server/spoolss/srv_spoolss_nt.c | 3 +-
4 files changed, 4 insertions(+), 56 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 0faba56..3dd785e 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -558,6 +558,7 @@ static PyMethodDef tdb_methods[] = {
{ NULL }
};
+void inittdb(void);
void inittdb(void)
{
PyObject *m;
diff --git a/libcli/security/create_descriptor.c
b/libcli/security/create_descriptor.c
index 62919a1..9252896 100644
--- a/libcli/security/create_descriptor.c
+++ b/libcli/security/create_descriptor.c
@@ -305,6 +305,7 @@ static void cr_descr_log_descriptor(struct
security_descriptor *sd,
}
}
+#if 0
static void cr_descr_log_acl(struct security_acl *acl,
const char *message,
int level)
@@ -318,6 +319,7 @@ static void cr_descr_log_acl(struct security_acl *acl,
DEBUG(level,("%s: NULL\n", message));
}
}
+#endif
static bool compute_acl(struct security_descriptor *parent_sd,
struct security_descriptor *creator_sd,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 766c744..5f0e878 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -405,60 +405,6 @@ int sys_acl_set_fd(vfs_handle_struct *handle, files_struct
*fsp,
SMB_ACL_T acl_d);
int sys_acl_delete_def_file(vfs_handle_struct *handle,
const char *path);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
int no_acl_syscall_error(int err);
/* The following definitions come from lib/sysquotas.c */
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 312f509..b4f3e5e 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -3404,7 +3404,6 @@ static bool construct_notify_printer_info(struct
messaging_context *msg_ctx,
uint16_t field;
struct spoolss_Notify *current_data;
- print_queue_struct *queue=NULL;
type = option_type->type;
@@ -3438,7 +3437,7 @@ static bool construct_notify_printer_info(struct
messaging_context *msg_ctx,
pinfo2->printername));
notify_info_data_table[j].fn(msg_ctx, snum, current_data,
- queue, pinfo2, mem_ctx);
+ NULL, pinfo2, mem_ctx);
info->count++;
}
--
Samba Shared Repository
