Changeset 232 for branches/samba-3.2.x/source/utils

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/source/utils

Files:

• net_ads.c (modified) (1 diff)
• net_rpc_join.c (modified) (2 diffs)
• net_status.c (modified) (5 diffs)
• smbcacls.c (modified) (1 diff)
• smbpasswd.c (modified) (1 diff)

branches/samba-3.2.x/source/utils/net_ads.c

@@ -307 +307 @@
                 tried_closest_dc = True; /* avoid loop */
 
-                if (!ads->config.tried_closest_dc) {
+                if (!ads_closest_dc(ads)) {
 
                         namecache_delete(ads->server.realm, 0x1C);

branches/samba-3.2.x/source/utils/net_rpc_join.c

@@ -240 +240 @@
         CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                            pipe_hnd->cli->desthost,
-                                           SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                           SAMR_ACCESS_ENUM_DOMAINS
+                                           | SAMR_ACCESS_OPEN_DOMAIN,
                                            &sam_pol),
                       "could not connect to SAM database");
@@ -247 +248 @@
         CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
                                              &sam_pol,
-                                             SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                             SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1
+                                             | SAMR_DOMAIN_ACCESS_CREATE_USER
+                                             | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
                                              domain_sid,
                                              &domain_pol),

branches/samba-3.2.x/source/utils/net_status.c

@@ -20 +20 @@
 #include "utils/net.h"
 
-static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
-                        void *state)
-{
-        bool *parseable = (bool *)state;
+static int show_session(struct db_record *rec, void *private_data)
+{
+        bool *parseable = (bool *)private_data;
         struct sessionid sessionid;
 
-        if (dbuf.dsize != sizeof(sessionid))
-                return 0;
-
-        memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
+        if (rec->value.dsize != sizeof(sessionid))
+                return 0;
+
+        memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
 
         if (!process_exists(sessionid.pid)) {
@@ -52 +51 @@
 static int net_status_sessions(int argc, const char **argv)
 {
-        TDB_CONTEXT *tdb;
+        struct db_context *db;
         bool parseable;
 
@@ -70 +69 @@
         }
 
-        tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
-                           TDB_DEFAULT, O_RDONLY, 0);
-
-        if (tdb == NULL) {
+        db = db_open(NULL, lock_path("sessionid.tdb"), 0,
+                     TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
+        if (db == NULL) {
                 d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
                 return -1;
         }
 
-        tdb_traverse(tdb, show_session, &parseable);
-        tdb_close(tdb);
+        db->traverse_read(db, show_session, &parseable);
+        TALLOC_FREE(db);
 
         return 0;
@@ -109 +107 @@
 };
 
-static int collect_pid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
-                       void *state)
-{
-        struct sessionids *ids = (struct sessionids *)state;
+static int collect_pid(struct db_record *rec, void *private_data)
+{
+        struct sessionids *ids = (struct sessionids *)private_data;
         struct sessionid sessionid;
 
-        if (dbuf.dsize != sizeof(sessionid))
-                return 0;
-
-        memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
+        if (rec->value.dsize != sizeof(sessionid))
+                return 0;
+
+        memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
 
         if (!process_exists(sessionid.pid)) 
@@ -172 +169 @@
 {
         struct sessionids ids;
-        TDB_CONTEXT *tdb;
+        struct db_context *db;
 
         ids.num_entries = 0;
         ids.entries = NULL;
 
-        tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
-                           TDB_DEFAULT, O_RDONLY, 0);
-
-        if (tdb == NULL) {
+        db = db_open(NULL, lock_path("sessionid.tdb"), 0,
+                     TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
+        if (db == NULL) {
                 d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
                 return -1;
         }
 
-        tdb_traverse(tdb, collect_pid, &ids);
-        tdb_close(tdb);
+        db->traverse_read(db, collect_pid, &ids);
+        TALLOC_FREE(db);
 
         connections_forall(show_share_parseable, &ids);

branches/samba-3.2.x/source/utils/smbcacls.c

@@ -738 +738 @@
         if (!cli_set_secdesc(cli, fnum, sd)) {
                 printf("ERROR: secdesc set failed: %s\n", cli_errstr(cli));
+                cli_close(cli, fnum);
+                return EXIT_FAILED;
         }
 

branches/samba-3.2.x/source/utils/smbpasswd.c

@@ -431 +431 @@
                 
                 if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) {
+                        struct passwd *passwd = getpwnam_alloc(NULL, user_name);
+
+                        if (!passwd) {
+                                fprintf(stderr, "Cannot locate Unix account for "
+                                        "'%s'!\n", user_name);
+                                exit(1);
+                        }
+                        TALLOC_FREE(passwd);
+
                         new_passwd = prompt_for_new_password(stdin_passwd_get);