Changeset 370 for branches/samba-3.3.x/source/libsmb

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

Location:

branches/samba-3.3.x/source/libsmb

Files:

• cliconnect.c (modified) (1 diff)
• clidfs.c (modified) (1 diff)
• clientgen.c (modified) (1 diff)
• clikrb5.c (modified) (4 diffs)
• libsmb_dir.c (modified) (3 diffs)
• libsmb_server.c (modified) (1 diff)

branches/samba-3.3.x/source/libsmb/cliconnect.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 static const struct {

branches/samba-3.3.x/source/libsmb/clidfs.c

@@ -236 +236 @@
                 }
                 d_printf("Anonymous login successful\n");
+                cli_init_creds(c, "", lp_workgroup(), "");
+        } else {
+                cli_init_creds(c, username, lp_workgroup(), password);
         }
 

branches/samba-3.3.x/source/libsmb/clientgen.c

@@ -409 +409 @@
         fstrcpy(cli->user_name, username);
         pwd_set_cleartext(&cli->pwd, password);
-        if (!*username) {
+        if ((username == NULL) || (!*username)) {
                 cli->pwd.null_pwd = true;
         }

branches/samba-3.3.x/source/libsmb/clikrb5.c

@@ -21 +21 @@
 */
 
-#define KRB5_PRIVATE    1       /* this file uses PRIVATE interfaces! */
-#define KRB5_DEPRECATED 1       /* this file uses DEPRECATED interfaces! */
-
 #include "includes.h"
+#include "smb_krb5.h"
+#include "authdata.h"
 
 #ifdef HAVE_KRB5
@@ -914 +913 @@
  krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry)
 {
-#if defined(HAVE_KRB5_KT_FREE_ENTRY)
+/* Try krb5_free_keytab_entry_contents first, since
+ * MIT Kerberos >= 1.7 has both krb5_free_keytab_entry_contents and
+ * krb5_kt_free_entry but only has a prototype for the first, while the
+ * second is considered private.
+ */
+#if defined(HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS)
+        return krb5_free_keytab_entry_contents(context, kt_entry);
+#elif defined(HAVE_KRB5_KT_FREE_ENTRY)
         return krb5_kt_free_entry(context, kt_entry);
-#elif defined(HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS)
-        return krb5_free_keytab_entry_contents(context, kt_entry);
 #else
 #error UNKNOWN_KT_FREE_FUNCTION
@@ -1843 +1847 @@
         char *p = NULL;
 
+/* MIT krb5 1.7beta3 (in Ubuntu Karmic) is missing the prototype,
+   but still has the symbol */
+#if !HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE
+krb5_error_code krb5_auth_con_set_req_cksumtype(
+        krb5_context     context,
+        krb5_auth_context      auth_context,
+        krb5_cksumtype     cksumtype);
+#endif
+
         ZERO_STRUCT(fwdData);
         ZERO_STRUCTP(authenticator);
@@ -1922 +1935 @@
 #endif
 
+/*
+ * smb_krb5_principal_get_realm
+ *
+ * @brief Get realm of a principal
+ *
+ * @param[in] context           The krb5_context
+ * @param[in] principal         The principal
+ * @return pointer to the realm
+ *
+ */
+
+char *smb_krb5_principal_get_realm(krb5_context context,
+                                   krb5_principal principal)
+{
+#ifdef HAVE_KRB5_PRINCIPAL_GET_REALM /* Heimdal */
+        return krb5_principal_get_realm(context, principal);
+#elif defined(krb5_princ_realm) /* MIT */
+        krb5_data *realm;
+        realm = krb5_princ_realm(context, principal);
+        return (char *)realm->data;
+#else
+        return NULL;
+#endif
+}
+
 #else /* HAVE_KRB5 */
  /* this saves a few linking headaches */

branches/samba-3.3.x/source/libsmb/libsmb_dir.c

@@ -618 +618 @@
                             (resolve_name(server, &rem_ss, 0x1d) ||   /* LMB */
                              resolve_name(server, &rem_ss, 0x1b) )) { /* DMB */
-
+                                /*
+                                 * "server" is actually a workgroup name,
+                                 * not a server. Make this clear.
+                                 */
+                                char *wgroup = server;
                                 fstring buserver;
 
@@ -626 +630 @@
                                  * Get the backup list ...
                                  */
-                                if (!name_status_find(server, 0x20, 0x20,
+                                if (!name_status_find(wgroup, 0, 0,
                                                       &rem_ss, buserver)) {
-
+                                        char addr[INET6_ADDRSTRLEN];
+
+                                        print_sockaddr(addr, sizeof(addr), &rem_ss);
                                         DEBUG(0,("Could not get name of "
-                                                 "local/domain master browser "
-                                                 "for server %s\n", server));
+                                                "local/domain master browser "
+                                                "for workgroup %s fro m"
+                                                "address %s\n",
+                                                wgroup,
+                                                addr));
                                         if (dir) {
                                                 SAFE_FREE(dir->fname);
@@ -664 +673 @@
 
                                 /* Now, list the servers ... */
-                                if (!cli_NetServerEnum(srv->cli, server,
+                                if (!cli_NetServerEnum(srv->cli, wgroup,
                                                        0x0000FFFE, list_fn,
                                                        (void *)dir)) {

branches/samba-3.3.x/source/libsmb/libsmb_server.c

@@ -498 +498 @@
                 }
         }
+
+        cli_init_creds(c, username_used, *pp_workgroup, *pp_password);
         
         DEBUG(4,(" session setup ok\n"));