Changeset 860 for vendor/current/source3/utils

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

Location:

vendor/current/source3/utils

Files:

• net_ads.c (modified) (12 diffs)
• net_dns.c (modified) (6 diffs)
• net_dns.h (added)
• net_printing.c (modified) (15 diffs)
• net_rpc.c (modified) (6 diffs)
• net_rpc_join.c (modified) (1 diff)
• net_serverid.c (modified) (2 diffs)
• net_status.c (modified) (1 diff)
• smbcontrol.c (modified) (1 diff)
• status.c (modified) (3 diffs)

vendor/current/source3/utils/net_ads.c

@@ -38 +38 @@
 #include "../libcli/security/security.h"
 #include "libsmb/libsmb.h"
+#include "utils/net_dns.h"
 
 #ifdef HAVE_ADS
@@ -1124 +1125 @@
 #if defined(WITH_DNS_UPDATES)
 #include "../lib/addns/dns.h"
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-                      const char *pszDomainName, const char *pszHostName,
-                      const struct sockaddr_storage *sslist,
-                      size_t num_addrs );
-
-static NTSTATUS net_update_dns_internal(TALLOC_CTX *ctx, ADS_STRUCT *ads,
+
+static NTSTATUS net_update_dns_internal(struct net_context *c,
+                                        TALLOC_CTX *ctx, ADS_STRUCT *ads,
                                         const char *machine_name,
                                         const struct sockaddr_storage *addrs,
@@ -1191 +1189 @@
 
                 if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
-                        DEBUG(3,("net_ads_join: Failed to find name server for the %s "
+                        DEBUG(3,("net_update_dns_internal: Failed to find name server for the %s "
                          "realm\n", ads->config.realm));
                         goto done;
@@ -1202 +1200 @@
         for (i=0; i < ns_count; i++) {
 
+                uint32_t flags = DNS_UPDATE_SIGNED |
+                                 DNS_UPDATE_UNSIGNED |
+                                 DNS_UPDATE_UNSIGNED_SUFFICIENT |
+                                 DNS_UPDATE_PROBE |
+                                 DNS_UPDATE_PROBE_SUFFICIENT;
+
+                if (c->opt_force) {
+                        flags &= ~DNS_UPDATE_PROBE_SUFFICIENT;
+                        flags &= ~DNS_UPDATE_UNSIGNED_SUFFICIENT;
+                }
+
+                status = NT_STATUS_UNSUCCESSFUL;
+
                 /* Now perform the dns update - we'll try non-secure and if we fail,
                    we'll follow it up with a secure update */
@@ -1207 +1218 @@
                 fstrcpy( dns_server, nameservers[i].hostname );
 
-                dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs);
+                dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs, flags);
                 if (ERR_DNS_IS_OK(dns_err)) {
                         status = NT_STATUS_OK;
@@ -1234 +1245 @@
 }
 
-static NTSTATUS net_update_dns_ext(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads,
+static NTSTATUS net_update_dns_ext(struct net_context *c,
+                                   TALLOC_CTX *mem_ctx, ADS_STRUCT *ads,
                                    const char *hostname,
                                    struct sockaddr_storage *iplist,
@@ -1264 +1276 @@
         }
 
-        status = net_update_dns_internal(mem_ctx, ads, machine_name,
+        status = net_update_dns_internal(c, mem_ctx, ads, machine_name,
                                          iplist, num_addrs);
 
@@ -1271 +1283 @@
 }
 
-static NTSTATUS net_update_dns(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, const char *hostname)
+static NTSTATUS net_update_dns(struct net_context *c, TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, const char *hostname)
 {
         NTSTATUS status;
 
-        status = net_update_dns_ext(mem_ctx, ads, hostname, NULL, 0);
+        status = net_update_dns_ext(c, mem_ctx, ads, hostname, NULL, 0);
         return status;
 }
@@ -1437 +1449 @@
 
         if (r->out.dns_domain_name) {
-                d_printf(_("Joined '%s' to realm '%s'\n"), r->in.machine_name,
+                d_printf(_("Joined '%s' to dns domain '%s'\n"), r->in.machine_name,
                         r->out.dns_domain_name);
         } else {
@@ -1480 +1492 @@
                 }
 
-                if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns( ctx, ads_dns, NULL)) ) {
+                if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns(c, ctx, ads_dns, NULL)) ) {
                         d_fprintf( stderr, _("DNS update failed!\n") );
                 }
@@ -1585 +1597 @@
         }
 
-        ntstatus = net_update_dns_ext(ctx, ads, hostname, addrs, num_addrs);
+        ntstatus = net_update_dns_ext(c, ctx, ads, hostname, addrs, num_addrs);
         if (!NT_STATUS_IS_OK(ntstatus)) {
                 d_fprintf( stderr, _("DNS update failed!\n") );
@@ -1605 +1617 @@
 #endif
 }
-
-#if defined(WITH_DNS_UPDATES)
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
-#endif
 
 static int net_ads_dns_gethostbyname(struct net_context *c, int argc, const char **argv)

vendor/current/source3/utils/net_dns.c

@@ -23 +23 @@
 #include "utils/net.h"
 #include "../lib/addns/dns.h"
+#include "utils/net_dns.h"
 
 #if defined(WITH_DNS_UPDATES)
-/*
- * Silly prototype to get rid of a warning
- */
+
+/*********************************************************************
+*********************************************************************/
 
 DNS_ERROR DoDNSUpdate(char *pszServerName,
                       const char *pszDomainName, const char *pszHostName,
-                      const struct sockaddr_storage *sslist,
-                      size_t num_addrs );
-
-/*********************************************************************
-*********************************************************************/
-
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-                      const char *pszDomainName, const char *pszHostName,
-                      const struct sockaddr_storage *sslist, size_t num_addrs )
+                      const struct sockaddr_storage *sslist, size_t num_addrs,
+                      uint32_t flags)
 {
         DNS_ERROR err;
@@ -47 +41 @@
         struct dns_update_request *req, *resp;
 
+        DEBUG(10,("DoDNSUpdate called with flags: 0x%08x\n", flags));
+
+        if (!(flags & DNS_UPDATE_SIGNED) &&
+            !(flags & DNS_UPDATE_UNSIGNED) &&
+            !(flags & DNS_UPDATE_PROBE)) {
+                return ERROR_DNS_INVALID_PARAMETER;
+        }
+
         if ( (num_addrs <= 0) || !sslist ) {
                 return ERROR_DNS_INVALID_PARAMETER;
@@ -60 +62 @@
         }
 
-        /*
-         * Probe if everything's fine
-         */
-
-        err = dns_create_probe(mem_ctx, pszDomainName, pszHostName,
-                               num_addrs, sslist, &req);
-        if (!ERR_DNS_IS_OK(err)) goto error;
-
-        err = dns_update_transaction(mem_ctx, conn, req, &resp);
-        if (!ERR_DNS_IS_OK(err)) goto error;
-
-        if (dns_response_code(resp->flags) == DNS_NO_ERROR) {
-                TALLOC_FREE(mem_ctx);
-                return ERROR_DNS_SUCCESS;
-        }
-
-        /*
-         * First try without signing
-         */
-
-        err = dns_create_update_request(mem_ctx, pszDomainName, pszHostName,
-                                        sslist, num_addrs, &req);
-        if (!ERR_DNS_IS_OK(err)) goto error;
-
-        err = dns_update_transaction(mem_ctx, conn, req, &resp);
-        if (!ERR_DNS_IS_OK(err)) goto error;
-
-        if (dns_response_code(resp->flags) == DNS_NO_ERROR) {
-                TALLOC_FREE(mem_ctx);
-                return ERROR_DNS_SUCCESS;
+        if (flags & DNS_UPDATE_PROBE) {
+
+                /*
+                 * Probe if everything's fine
+                 */
+
+                err = dns_create_probe(mem_ctx, pszDomainName, pszHostName,
+                                       num_addrs, sslist, &req);
+                if (!ERR_DNS_IS_OK(err)) goto error;
+
+                err = dns_update_transaction(mem_ctx, conn, req, &resp);
+                if (!ERR_DNS_IS_OK(err)) goto error;
+
+                if (!ERR_DNS_IS_OK(err)) {
+                        DEBUG(3,("DoDNSUpdate: failed to probe DNS\n"));
+                }
+
+                if ((dns_response_code(resp->flags) == DNS_NO_ERROR) &&
+                    (flags & DNS_UPDATE_PROBE_SUFFICIENT)) {
+                        TALLOC_FREE(mem_ctx);
+                        return ERROR_DNS_SUCCESS;
+                }
+        }
+
+        if (flags & DNS_UPDATE_UNSIGNED) {
+
+                /*
+                 * First try without signing
+                 */
+
+                err = dns_create_update_request(mem_ctx, pszDomainName, pszHostName,
+                                                sslist, num_addrs, &req);
+                if (!ERR_DNS_IS_OK(err)) goto error;
+
+                err = dns_update_transaction(mem_ctx, conn, req, &resp);
+                if (!ERR_DNS_IS_OK(err)) goto error;
+
+                if (!ERR_DNS_IS_OK(err)) {
+                        DEBUG(3,("DoDNSUpdate: unsigned update failed\n"));
+                }
+
+                if ((dns_response_code(resp->flags) == DNS_NO_ERROR) &&
+                    (flags & DNS_UPDATE_UNSIGNED_SUFFICIENT)) {
+                        TALLOC_FREE(mem_ctx);
+                        return ERROR_DNS_SUCCESS;
+                }
         }
 
@@ -95 +113 @@
          * Okay, we have to try with signing
          */
-        {
+        if (flags & DNS_UPDATE_SIGNED) {
                 gss_ctx_id_t gss_context;
                 char *keyname;
+
+                err = dns_create_update_request(mem_ctx, pszDomainName, pszHostName,
+                                                sslist, num_addrs, &req);
+                if (!ERR_DNS_IS_OK(err)) goto error;
 
                 if (!(keyname = dns_generate_keyname( mem_ctx ))) {
@@ -129 +151 @@
                 err = (dns_response_code(resp->flags) == DNS_NO_ERROR) ?
                         ERROR_DNS_SUCCESS : ERROR_DNS_UPDATE_FAILED;
+
+                if (!ERR_DNS_IS_OK(err)) {
+                        DEBUG(3,("DoDNSUpdate: signed update failed\n"));
+                }
         }
 
@@ -177 +203 @@
         return count;
 }
-
-/*
- * Silly prototype to get rid of a warning
- */
-
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
 
 DNS_ERROR do_gethostbyname(const char *server, const char *host)

vendor/current/source3/utils/net_printing.c

@@ -38 +38 @@
 #define SECDESC_PREFIX "SECDESC/"
 
+#define ARG_ENCODING "encoding="
+
+struct printing_opts {
+        const char *encoding;
+        const char *tdb;
+};
+
+static NTSTATUS printing_parse_args(TALLOC_CTX *mem_ctx,
+                                    struct printing_opts **popts,
+                                    int argc, const char **argv)
+{
+        size_t c;
+        struct printing_opts *o;
+
+        if (argc == 0) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        o = talloc_zero(mem_ctx, struct printing_opts);
+        if (o == NULL) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        for (c = 0; c < argc; c++) {
+                if (strnequal(argv[c], ARG_ENCODING, sizeof(ARG_ENCODING) - 1)) {
+                        o->encoding = talloc_strdup(o,
+                                        argv[c] + sizeof(ARG_ENCODING) - 1);
+                        if (o->encoding == NULL) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                } else {
+                        o->tdb = talloc_strdup(o, argv[c]);
+                        if (o->tdb == NULL) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                }
+        }
+
+        *popts = o;
+        return NT_STATUS_OK;
+}
+
 static void dump_form(TALLOC_CTX *mem_ctx,
                       const char *key_name,
@@ -71 +113 @@
                         const char *key_name,
                         unsigned char *data,
-                        size_t length)
+                        size_t length,
+                        bool do_string_conversion)
 {
         enum ndr_err_code ndr_err;
@@ -83 +126 @@
 
         ZERO_STRUCT(r);
+
+        if (do_string_conversion) {
+                r.string_flags = LIBNDR_FLAG_STR_ASCII;
+        }
 
         ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &r,
@@ -101 +148 @@
                          const char *key_name,
                          unsigned char *data,
-                         size_t length)
+                         size_t length,
+                         bool do_string_conversion)
 {
         enum ndr_err_code ndr_err;
@@ -113 +161 @@
 
         ZERO_STRUCT(r);
+
+        if (do_string_conversion) {
+                r.info.string_flags = LIBNDR_FLAG_STR_ASCII;
+        }
 
         ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &r,
@@ -166 +218 @@
         TDB_CONTEXT *tdb;
         TDB_DATA kbuf, newkey, dbuf;
+        struct printing_opts *o;
+        const char *save_dos_charset = lp_dos_charset();
+        bool do_string_conversion = false;
+        NTSTATUS status;
 
         if (argc < 1 || c->display_usage) {
-                d_fprintf(stderr, "%s\nnet printing dump <file.tdb>\n",
-                          _("Usage:"));
+                d_printf(  "%s\n"
+                           "net printing dump [options] <file.tdb>\n"
+                           "    %s\n",
+                         _("Usage:"),
+                         _("Dump formated printer information of the tdb."));
+                d_printf(_("Valid options:\n"));
+                d_printf(_("    encoding=<CP>   Set the Code Page of the tdb file.\n"
+                           "                    See iconv -l for the list of CP values\n"
+                           "                    (CP1252 is Western latin1, CP1251 is Cyrillic).\n"));
                 goto done;
         }
 
-        tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0600);
+        status = printing_parse_args(ctx, &o, argc, argv);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_fprintf(stderr, _("failed to parse arguments\n"));
+                goto done;
+        }
+
+        tdb = tdb_open_log(o->tdb, 0, TDB_DEFAULT, O_RDONLY, 0600);
         if (!tdb) {
-                d_fprintf(stderr, _("failed to open tdb file: %s\n"), argv[0]);
+                d_fprintf(stderr, _("failed to open tdb file: %s\n"), o->tdb);
                 goto done;
+        }
+
+        if (o->encoding != NULL) {
+                lp_set_cmdline("dos charset", o->encoding);
+                d_fprintf(stderr, _("do string conversion from %s to %s\n"),
+                                    lp_dos_charset(), lp_unix_charset());
+                do_string_conversion = true;
         }
 
@@ -195 +271 @@
 
                 if (strncmp((const char *)kbuf.dptr, DRIVERS_PREFIX, strlen(DRIVERS_PREFIX)) == 0) {
-                        dump_driver(ctx, (const char *)kbuf.dptr+strlen(DRIVERS_PREFIX), dbuf.dptr, dbuf.dsize);
+                        dump_driver(ctx,
+                                    (const char *)kbuf.dptr+strlen(DRIVERS_PREFIX),
+                                    dbuf.dptr,
+                                    dbuf.dsize,
+                                    do_string_conversion);
                         SAFE_FREE(dbuf.dptr);
                         continue;
@@ -201 +281 @@
 
                 if (strncmp((const char *)kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) {
-                        dump_printer(ctx, (const char *)kbuf.dptr+strlen(PRINTERS_PREFIX), dbuf.dptr, dbuf.dsize);
+                        dump_printer(ctx,
+                                     (const char *)kbuf.dptr+strlen(PRINTERS_PREFIX),
+                                     dbuf.dptr,
+                                     dbuf.dsize,
+                                     do_string_conversion);
                         SAFE_FREE(dbuf.dptr);
                         continue;
@@ -217 +301 @@
 
  done:
+        lp_set_cmdline("dos charset", save_dos_charset);
         talloc_free(ctx);
         return ret;
@@ -230 +315 @@
                                           const char **argv)
 {
+        struct printing_opts *o;
         TALLOC_CTX *tmp_ctx;
         TDB_CONTEXT *tdb;
         TDB_DATA kbuf, newkey, dbuf;
         NTSTATUS status;
+        const char *save_dos_charset = lp_dos_charset();
+        bool do_string_conversion = false;
 
         tmp_ctx = talloc_new(mem_ctx);
@@ -240 +328 @@
         }
 
-        tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0600);
+        status = printing_parse_args(tmp_ctx, &o, argc, argv);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_fprintf(stderr, _("failed to parse arguments\n"));
+                goto done;
+        }
+
+        tdb = tdb_open_log(o->tdb, 0, TDB_DEFAULT, O_RDONLY, 0600);
         if (tdb == NULL) {
-                d_fprintf(stderr, _("failed to open tdb file: %s\n"), argv[0]);
+                d_fprintf(stderr, _("failed to open tdb file: %s\n"), o->tdb);
                 status = NT_STATUS_NO_SUCH_FILE;
                 goto done;
+        }
+
+        if (o->encoding != NULL) {
+                lp_set_cmdline("dos charset", o->encoding);
+                d_fprintf(stderr, _("do string conversion from %s to %s\n"),
+                                    lp_dos_charset(), lp_unix_charset());
+                do_string_conversion = true;
         }
 
@@ -271 +372 @@
                                        (const char *) kbuf.dptr + strlen(DRIVERS_PREFIX),
                                        dbuf.dptr,
-                                       dbuf.dsize);
+                                       dbuf.dsize,
+                                       do_string_conversion);
                         SAFE_FREE(dbuf.dptr);
                         continue;
@@ -281 +383 @@
                                         (const char *) kbuf.dptr + strlen(PRINTERS_PREFIX),
                                         dbuf.dptr,
-                                        dbuf.dsize);
+                                        dbuf.dsize,
+                                        do_string_conversion);
                         SAFE_FREE(dbuf.dptr);
                         continue;
@@ -313 +416 @@
 
  done:
+        lp_set_cmdline("dos charset", save_dos_charset);
         talloc_free(tmp_ctx);
         return status;
@@ -323 +427 @@
         if (argc < 1 || c->display_usage) {
                 d_printf(  "%s\n"
-                           "net printing migrate <file.tdb>\n"
+                           "net printing migrate [options] <file.tdb>\n"
                            "    %s\n",
                          _("Usage:"),
                          _("Migrate tdb printing files to new storage"));
+                d_printf(_("Valid options:\n"));
+                d_printf(_("    encoding=<CP>   Set the Code Page of the tdb file.\n"
+                           "                    See iconv -l for the list of CP values\n"
+                           "                    (CP1252 is Western latin1, CP1251 is Cyrillic).\n"));
                 return 0;
         }

vendor/current/source3/utils/net_rpc.c

@@ -1657 +1657 @@
                 goto done;
         }
+        if (group_rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (name_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
 
         switch (name_types.ids[0])
@@ -2064 +2072 @@
                 goto done;
         }
+        if (rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (rid_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
 
         status = dcerpc_samr_OpenGroup(b, mem_ctx,
@@ -2317 +2333 @@
                 d_fprintf(stderr, _("Could not lookup up group member %s\n"),
                           member);
+                goto done;
+        }
+        if (rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (rid_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                 goto done;
         }
@@ -2866 +2890 @@
                         return result;
                 }
-
+                if (names.count != this_time) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+                if (types.count != this_time) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
                 /* We only have users as members, but make the output
                    the same as the output of alias members */
@@ -3102 +3131 @@
                 d_fprintf(stderr, _("Couldn't find group %s\n"),
                           argv[0]);
-                return result;
-        }
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (rid_types.count != 1) {
+                d_fprintf(stderr, _("Couldn't find group %s\n"),
+                          argv[0]);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
 
         if (rid_types.ids[0] == SID_NAME_DOM_GRP) {
@@ -6017 +6052 @@
                            "failed %s\n"),
                         acct_name, nt_errstr(result) );
+                goto done;
+        }
+        if (user_rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (name_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                 goto done;
         }

vendor/current/source3/utils/net_rpc_join.c

@@ -368 +368 @@
                              acct_name, nt_errstr(status), nt_errstr(result)));
 
+        if (user_rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (name_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+
         if (name_types.ids[0] != SID_NAME_USER) {
                 DEBUG(0, ("%s is not a user account (type=%d)\n", acct_name, name_types.ids[0]));

vendor/current/source3/utils/net_serverid.c

@@ -37 +37 @@
                              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;
@@ -114 +118 @@
                                 const char **argv)
 {
+        if (!sessionid_init()) {
+                d_printf("failed to open sessionid.tdb\n");
+                return -1;
+        };
+
         connections_forall(net_serverid_wipedbs_conn, NULL);
         sessionid_traverse(net_serverid_wipedbs_sessionid, NULL);

vendor/current/source3/utils/net_status.c

@@ -240 +240 @@
                 {NULL, NULL, 0, NULL, NULL}
         };
+
+        if (!sessionid_init_readonly()) {
+                d_printf("failed to open sessionid.tdb\n");
+                return -1;
+        }
+
         return net_run_function(c, argc, argv, "net status", func);
 }

vendor/current/source3/utils/smbcontrol.c

@@ -937 +937 @@
         }
 
-        return send_message(msg_ctx, pid, MSG_DEBUG, argv[1],
+        return send_message(msg_ctx, pid, MSG_PRINTER_DRVUPGRADE, argv[1],
                             strlen(argv[1]) + 1);
 }

vendor/current/source3/utils/status.c

@@ -39 +39 @@
 #include "locking/proto.h"
 #include "messages.h"
+#include "serverid.h"
 
 #define SMB_MAXPIDS             2048
@@ -379 +380 @@
 
 
+        if (!sessionid_init_readonly()) {
+                fprintf(stderr, "Can't open sessionid.tdb\n");
+                ret = -1;
+                goto done;
+        }
+
         if (lp_clustering()) {
                 /*
@@ -471 +478 @@
                 }
 
+                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);