The branch, master has been updated
via 84a13e7 ctdb/ltdbtool: Fix static declarations
via e2642da smbcacls: Do not read old ACL for 'set' operation
via 8bb4fcc gensec: Change log level of message when no PAC is found
via 3d33ebe winbindd: Remove unused prototypes for winbindd_group.c
from e0d8c6b s3:client:smbspool_krb5_wrapper: fix the non clearenv build.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 84a13e70a61ae0b1207805bb08b34b0fb32e5248
Author: Christof Schmitt <c...@samba.org>
Date: Tue Apr 26 12:15:20 2016 -0700
ctdb/ltdbtool: Fix static declarations
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Sat Apr 30 04:28:13 CEST 2016 on sn-devel-144
commit e2642da130f96c542aa4962b76c1b9d1f677162d
Author: Christof Schmitt <c...@samba.org>
Date: Fri Apr 29 15:12:38 2016 -0700
smbcacls: Do not read old ACL for 'set' operation
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 8bb4fccd2758cba5907134621ef57186e70a7073
Author: Christof Schmitt <c...@samba.org>
Date: Thu Apr 28 11:23:41 2016 -0700
gensec: Change log level of message when no PAC is found
For a Samba server that uses a non-AD KDC this message is triggered on
every new connection. Change the log level from warning/1 to a more
appropriate notice/5.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 3d33ebe36bc2aece6b16d86eb18d51c241c30fc5
Author: Christof Schmitt <c...@samba.org>
Date: Sun Apr 17 21:27:31 2016 -0700
winbindd: Remove unused prototypes for winbindd_group.c
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
auth/gensec/gensec_util.c | 4 ++--
ctdb/tools/ltdbtool.c | 25 ++++++++++++++-----------
source3/utils/smbcacls.c | 14 ++++++++++----
source3/winbindd/winbindd_proto.h | 11 -----------
4 files changed, 26 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/gensec/gensec_util.c b/auth/gensec/gensec_util.c
index 64fffb1..da2e2e5 100644
--- a/auth/gensec/gensec_util.c
+++ b/auth/gensec/gensec_util.c
@@ -48,8 +48,8 @@ NTSTATUS gensec_generate_session_info_pac(TALLOC_CTX *mem_ctx,
principal_string));
return NT_STATUS_ACCESS_DENIED;
}
- DEBUG(1, ("Unable to find PAC for %s, resorting to local user
lookup\n",
- principal_string));
+ DBG_NOTICE("Unable to find PAC for %s, resorting to local "
+ "user lookup\n", principal_string);
}
if (gensec_security->auth_context &&
gensec_security->auth_context->generate_session_info_pac) {
diff --git a/ctdb/tools/ltdbtool.c b/ctdb/tools/ltdbtool.c
index 7ac70e2..2352079 100644
--- a/ctdb/tools/ltdbtool.c
+++ b/ctdb/tools/ltdbtool.c
@@ -302,9 +302,10 @@ ltdb_traverse_fn(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA
val,
return ctx->fn(tdb, key, val, &hdr.hdr, ctx->state);
}
-int ltdb_traverse(TDB_CONTEXT *tdb,
- int (*fn)(TDB_CONTEXT *,TDB_DATA,TDB_DATA,struct
ctdb_ltdb_header*,void *),
- void *state, int hsize, bool skip_empty)
+static int ltdb_traverse(TDB_CONTEXT *tdb,
+ int (*fn)(TDB_CONTEXT*, TDB_DATA, TDB_DATA,
+ struct ctdb_ltdb_header*, void *),
+ void *state, int hsize, bool skip_empty)
{
struct ltdb_traverse_ctx ctx = {
.fn = fn,
@@ -318,9 +319,9 @@ int ltdb_traverse(TDB_CONTEXT *tdb,
return (ret < 0) ? ret : (ret - ctx.nempty);
}
-int write_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA val,
- struct ctdb_ltdb_header* hdr,
- void* write_record_ctx)
+static int write_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA val,
+ struct ctdb_ltdb_header* hdr,
+ void* write_record_ctx)
{
struct write_record_ctx* ctx
= (struct write_record_ctx*)write_record_ctx;
@@ -347,9 +348,9 @@ int write_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA
val,
return 0;
}
-int dump_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA val,
- struct ctdb_ltdb_header* hdr,
- void* dump_record_ctx)
+static int dump_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA val,
+ struct ctdb_ltdb_header* hdr,
+ void* dump_record_ctx)
{
struct dump_record_ctx* ctx = (struct dump_record_ctx*)dump_record_ctx;
@@ -363,14 +364,16 @@ int dump_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA
val,
return 0;
}
-void dump_header_full(struct dump_record_ctx* c, struct ctdb_ltdb_header* h)
+static void dump_header_full(struct dump_record_ctx* c,
+ struct ctdb_ltdb_header* h)
{
fprintf(c->file, "dmaster: %d\nrsn: %llu\nflags: 0x%X\n",
(int)h->dmaster,
(unsigned long long)h->rsn, h->flags);
}
-void print_data_tdbdump(FILE* file, TDB_DATA data) {
+static void print_data_tdbdump(FILE* file, TDB_DATA data)
+{
unsigned char *ptr = data.dptr;
fputc('"', file);
while (data.dsize--) {
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index d50219c..5cb707d 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -505,10 +505,16 @@ static int cacl_set(struct cli_state *cli, const char
*filename,
if (!sd) return EXIT_PARSE_ERROR;
if (test_args) return EXIT_OK;
- old = get_secdesc(cli, filename);
-
- if (!old) {
- return EXIT_FAILED;
+ if (mode != SMB_ACL_SET) {
+ /*
+ * Do not fetch old ACL when it will be overwritten
+ * completely with a new one.
+ */
+ old = get_secdesc(cli, filename);
+
+ if (!old) {
+ return EXIT_FAILED;
+ }
}
/* the logic here is rather more complex than I would like */
diff --git a/source3/winbindd/winbindd_proto.h
b/source3/winbindd/winbindd_proto.h
index 49ae475..4d99927 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -306,17 +306,6 @@ NTSTATUS winbindd_reinit_after_fork(const struct
winbindd_child *myself,
struct winbindd_domain *wb_child_domain(void);
/* The following definitions come from winbindd/winbindd_group.c */
-
-void winbindd_getgrnam(struct winbindd_cli_state *state);
-void winbindd_getgrgid(struct winbindd_cli_state *state);
-void winbindd_setgrent(struct winbindd_cli_state *state);
-void winbindd_endgrent(struct winbindd_cli_state *state);
-void winbindd_getgrent(struct winbindd_cli_state *state);
-void winbindd_list_groups(struct winbindd_cli_state *state);
-void winbindd_getgroups(struct winbindd_cli_state *state);
-void winbindd_getusersids(struct winbindd_cli_state *state);
-void winbindd_getuserdomgroups(struct winbindd_cli_state *state);
-void winbindd_getsidaliases(struct winbindd_cli_state *state);
bool fill_grent(TALLOC_CTX *mem_ctx, struct winbindd_gr *gr,
const char *dom_name, const char *gr_name, gid_t unix_gid);
NTSTATUS winbindd_print_groupmembers(struct talloc_dict *members,
--
Samba Shared Repository
