diff options
| author | Günther Deschner <gd@samba.org> | 2013-09-06 18:08:45 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-09-09 10:08:25 +0200 |
| commit | 037f9ead5fc490e7e463671b76e8e8474a8728f5 (patch) | |
| tree | b243189d2cdc2b39a5805a299223768457577282 | |
| parent | 11d5d3d49ecec0d2ae924ff843e97cc39fa64a16 (diff) | |
| download | samba-037f9ead5fc490e7e463671b76e8e8474a8728f5.tar.gz | |
s3-serverid: call serverid_init_readonly() from commandline tools.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
The last 4 patches are follow-up patches for bug #10127 - smbstatus stopped
working as non-root user.
| -rw-r--r-- | source3/utils/net_serverid.c | 4 | ||||
| -rw-r--r-- | source3/utils/status.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c index 7d50ab1d9de..5e61f114738 100644 --- a/source3/utils/net_serverid.c +++ b/source3/utils/net_serverid.c @@ -36,6 +36,10 @@ static int net_serverid_list_fn(const struct server_id *id, static int net_serverid_list(struct net_context *c, int argc, const char **argv) { + if (!serverid_init_readonly(c)) { + d_printf("failed to open serverid.tdb\n"); + return -1; + } d_printf("pid unique_id msg_flags\n"); return serverid_traverse_read(net_serverid_list_fn, NULL) ? 0 : -1; } diff --git a/source3/utils/status.c b/source3/utils/status.c index dc0509673a0..b89a77920f4 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -38,6 +38,7 @@ #include "session.h" #include "locking/proto.h" #include "messages.h" +#include "serverid.h" #define SMB_MAXPIDS 2048 static uid_t Ucrit_uid = 0; /* added by OH */ @@ -476,6 +477,11 @@ static int traverse_sessionid(const char *key, struct sessionid *session, goto done; } + if (!serverid_init_readonly(frame)) { + d_printf("Can't initialise serverid tdb - exiting\n"); + ret = 1; + goto done; + } result = share_mode_forall(print_share_mode, NULL); if (result == 0) { |