Changeset 134 for branches/samba-3.0/source/utils/net.c

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/utils/net.c (modified) (3 diffs)

branches/samba-3.0/source/utils/net.c

@@ -347 +347 @@
 
 /****************************************************************************
- Use the local machine's password for this session.
+ Use the local machine account (krb) and password for this session.
 ****************************************************************************/
 
-int net_use_machine_password(void) 
+int net_use_krb_machine_account(void) 
 {
         char *user_name = NULL;
@@ -359 +359 @@
         }
 
-        user_name = NULL;
         opt_password = secrets_fetch_machine_password(opt_target_workgroup, NULL, NULL);
         if (asprintf(&user_name, "%s$@%s", global_myname(), lp_realm()) == -1) {
+                return -1;
+        }
+        opt_user_name = user_name;
+        return 0;
+}
+
+/****************************************************************************
+ Use the machine account name and password for this session.
+****************************************************************************/
+
+int net_use_machine_account(void)
+{
+        char *user_name = NULL;
+                
+        if (!secrets_init()) {
+                d_fprintf(stderr, "ERROR: Unable to open secrets database\n");
+                exit(1);
+        }
+
+        opt_password = secrets_fetch_machine_password(opt_target_workgroup, NULL, NULL);
+        if (asprintf(&user_name, "%s$", global_myname()) == -1) {
                 return -1;
         }
@@ -1035 +1055 @@
                    machine account for testing purposes and for domain leave */
 
-                net_use_machine_password();
+                net_use_krb_machine_account();
         }