Attachment 17802 Details for Bug 53188 – cifs-utils set hostname for domain-based share

[patch] cifs-utils set hostname for domain-based share

cifs-utils_hostname.patch (text/plain), 9.44 KB, created by Evgeny Sinelnikov on 2025-02-21 12:12:30 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Evgeny Sinelnikov

Created: 2025-02-21 12:12:30 MSK

Size: 9.44 KB

patch

obsolete

>diff --git a/cldap_ping.c b/cldap_ping.c
>index 9183b27..ecb8506 100644
>--- a/cldap_ping.c
>+++ b/cldap_ping.c
>@@ -279,7 +279,7 @@ int netlogon_get_client_site(char *netlogon_response, size_t netlogon_size, char
> 	for (int i=0; i < 8; i++) {
> 		// iterate over DnsForestName, DnsDomainName, NetbiosDomainName, NetbiosComputerName, UserName, DcSiteName
> 		// to finally get to our desired ClientSiteName field
>-		if (read_dns_string(netlogon_response, netlogon_size, sitename, MAXCDNAME, &offset) < 0) {
>+		if (read_dns_string(netlogon_response, netlogon_size, sitename, MAXLABEL, &offset) < 0) {
> 			return CLDAP_PING_PARSE_ERROR_NETLOGON;
> 		}
> 	}
>diff --git a/cldap_ping.h b/cldap_ping.h
>index 9a23e72..a15a14c 100644
>--- a/cldap_ping.h
>+++ b/cldap_ping.h
>@@ -8,7 +8,7 @@
> 
> // returns CLDAP_PING_TRYNEXT if you should use another dc
> // any other error code < 0 is a fatal error
>-// site_name must be of MAXCDNAME size!
>+// site_name must be of MAXLABEL size!
> int cldap_ping(char *domain, sa_family_t family, void *addr, char *site_name);
> 
> #endif /* _CLDAP_PING_H_ */
>diff --git a/mount.cifs.c b/mount.cifs.c
>index 3b7a6b3..8b7327f 100644
>--- a/mount.cifs.c
>+++ b/mount.cifs.c
>@@ -186,6 +186,7 @@ struct parsed_mount_info {
> 	char username[MAX_USERNAME_SIZE + 1];
> 	char password[MOUNT_PASSWD_SIZE + 1];
> 	char addrlist[MAX_ADDR_LIST_LEN];
>+	char hostlist[MAX_HOST_LIST_LEN];
> 	unsigned int got_user:1;
> 	unsigned int got_password:1;
> 	unsigned int fakemnt:1;
>@@ -1845,6 +1846,7 @@ assemble_mountinfo(struct parsed_mount_info *parsed_info,
> {
> 	int rc;
> 	char *newopts = NULL;
>+	char *hostlist;
> 
> 	rc = drop_capabilities(0);
> 	if (rc)
>@@ -1889,8 +1891,10 @@ assemble_mountinfo(struct parsed_mount_info *parsed_info,
> 	if (rc)
> 		goto assemble_exit;
> 
>+	parsed_info->hostlist[0] = '\0';
> 	if (parsed_info->addrlist[0] == '\0') {
>-		rc = resolve_host(parsed_info->host, parsed_info->addrlist);
>+		hostlist = parsed_info->is_krb5 ? parsed_info->hostlist : NULL;
>+		rc = resolve_host_with_names(parsed_info->host, parsed_info->addrlist, hostlist);
> 		if (rc == 0 && parsed_info->verboseflag)
> 			fprintf(stderr, "Host \"%s\" resolved to the following IP addresses: %s\n", parsed_info->host, parsed_info->addrlist);
> 	}
>@@ -2047,6 +2051,7 @@ int main(int argc, char **argv)
> 	char *options = NULL;
> 	char *orig_dev = NULL;
> 	char *currentaddress, *nextaddress;
>+	char *currenthost, *nexthost;
> 	char *value = NULL;
> 	char *ep = NULL;
> 	int rc = 0;
>@@ -2205,12 +2210,14 @@ assemble_retry:
> 	}
> 
> 	currentaddress = parsed_info->addrlist;
>-	nextaddress = strchr(currentaddress, ',');
>-	if (nextaddress)
>-		*nextaddress++ = '\0';
>+	nextaddress = NULL;
>+	currenthost = parsed_info->hostlist;
>+	nexthost = NULL;
> 
> mount_retry:
> 	options[0] = '\0';
>+	iterlist(&currentaddress, &nextaddress);
>+	iterlist(&currenthost, &nexthost);
> 	if (!currentaddress) {
> 		fprintf(stderr, "Unable to find suitable address.\n");
> 		rc = parsed_info->nofail ? 0 : EX_FAIL;
>@@ -2234,9 +2241,14 @@ mount_retry:
> 		strlcat(options, parsed_info->prefix, options_size);
> 	}
> 
>-	if (sloppy)
>+	if (sloppy || currenthost)
> 		strlcat(options, ",sloppy", options_size);
> 
>+	if (currenthost) {
>+		strlcat(options, ",hostname=", options_size);
>+		strlcat(options, currenthost, options_size);
>+	}
>+
> 	if (parsed_info->verboseflag)
> 		fprintf(stderr, "%s kernel mount options: %s",
> 			thisprogram, options);
>@@ -2273,12 +2285,6 @@ mount_retry:
> 				fprintf(stderr, "mount error(%d): could not connect to %s",
> 					errno, currentaddress);
> 			}
>-			currentaddress = nextaddress;
>-			if (currentaddress) {
>-				nextaddress = strchr(currentaddress, ',');
>-				if (nextaddress)
>-					*nextaddress++ = '\0';
>-			}
> 			goto mount_retry;
> 		case ENODEV:
> 			fprintf(stderr,
>diff --git a/resolve_host.c b/resolve_host.c
>index fc682e5..e479716 100644
>--- a/resolve_host.c
>+++ b/resolve_host.c
>@@ -37,7 +37,7 @@
> /*
>  * resolve hostname to comma-separated list of address(es)
>  */
>-int resolve_host(const char *host, char *addrstr) {
>+int resolve_host_with_names(const char *host, char *addrstr, char *hoststr) {
> 	int rc;
> 	/* 10 for max width of decimal scopeid */
> 	char tmpbuf[NI_MAXHOST + 1 + 10 + 1];
>@@ -114,7 +114,7 @@ int resolve_host(const char *host, char *addrstr) {
> 
> 
> 	// Is this a DFS domain where we need to do a cldap ping to find the closest node?
>-	if (count_v4 > 1 || count_v6 > 1) {
>+	if (count_v4 > 1 || count_v6 > 1 || hoststr) {
> 		int res;
> 		ns_msg global_domain_handle;
> 		unsigned char global_domain_lookup[4096];
>@@ -122,6 +122,8 @@ int resolve_host(const char *host, char *addrstr) {
> 		unsigned char site_domain_lookup[4096];
> 		char dname[MAXCDNAME];
> 		int srv_cnt;
>+		int number_addresses = 0;
>+		const char *hostname;
> 
> 		res = res_init();
> 		if (res != 0)
>@@ -144,7 +146,7 @@ int resolve_host(const char *host, char *addrstr) {
> 
> 		// No or just one DC we are done
> 		if (srv_cnt < 2)
>-			goto resolve_host_out;
>+			goto resolve_host_global;
> 
> 		char site_name[MAXCDNAME];
> 		// We assume that AD always sends the ip addresses in the addtional data block
>@@ -199,7 +201,6 @@ int resolve_host(const char *host, char *addrstr) {
> 		if (res < 0)
> 			goto resolve_host_out;
> 
>-		int number_addresses = 0;
> 		for (int i = 0; i < ns_msg_count(site_domain_handle, ns_s_ar); i++) {
> 			if (i > MAX_ADDRESSES)
> 				break;
>@@ -213,6 +214,7 @@ int resolve_host(const char *host, char *addrstr) {
> 				case ns_t_aaaa:
> 					if (ns_rr_rdlen(rr) != NS_IN6ADDRSZ)
> 						continue;
>+					hostname = ns_rr_name(rr);
> 					ipaddr = inet_ntop(AF_INET6, ns_rr_rdata(rr), tmpbuf,
> 									   sizeof(tmpbuf));
> 					if (!ipaddr) {
>@@ -223,6 +225,7 @@ int resolve_host(const char *host, char *addrstr) {
> 				case ns_t_a:
> 					if (ns_rr_rdlen(rr) != NS_INADDRSZ)
> 						continue;
>+					hostname = ns_rr_name(rr);
> 					ipaddr = inet_ntop(AF_INET, ns_rr_rdata(rr), tmpbuf,
> 									   sizeof(tmpbuf));
> 					if (!ipaddr) {
>@@ -236,14 +239,22 @@ int resolve_host(const char *host, char *addrstr) {
> 
> 			number_addresses++;
> 
>-			if (i == 0)
>+			if (i == 0) {
> 				*addrstr = '\0';
>-			else
>+				if (hoststr)
>+					*hoststr = '\0';
>+			} else {
> 				strlcat(addrstr, ",", MAX_ADDR_LIST_LEN);
>+				if (hoststr)
>+					strlcat(hoststr, ",", MAX_ADDR_LIST_LEN);
>+			}
> 
> 			strlcat(addrstr, tmpbuf, MAX_ADDR_LIST_LEN);
>+			if (hoststr)
>+				strlcat(hoststr, hostname, MAX_HOST_LIST_LEN);
> 		}
> 
>+resolve_host_global:
> 		// Preferred site ips is now the first entry in addrstr, fill up with other sites till MAX_ADDRESS
> 		for (int i = 0; i < ns_msg_count(global_domain_handle, ns_s_ar); i++) {
> 			if (number_addresses > MAX_ADDRESSES)
>@@ -258,6 +269,7 @@ int resolve_host(const char *host, char *addrstr) {
> 				case ns_t_aaaa:
> 					if (ns_rr_rdlen(rr) != NS_IN6ADDRSZ)
> 						continue;
>+					hostname = ns_rr_name(rr);
> 					ipaddr = inet_ntop(AF_INET6, ns_rr_rdata(rr), tmpbuf,
> 									   sizeof(tmpbuf));
> 					if (!ipaddr) {
>@@ -268,6 +280,7 @@ int resolve_host(const char *host, char *addrstr) {
> 				case ns_t_a:
> 					if (ns_rr_rdlen(rr) != NS_INADDRSZ)
> 						continue;
>+					hostname = ns_rr_name(rr);
> 					ipaddr = inet_ntop(AF_INET, ns_rr_rdata(rr), tmpbuf,
> 									   sizeof(tmpbuf));
> 					if (!ipaddr) {
>@@ -279,6 +292,12 @@ int resolve_host(const char *host, char *addrstr) {
> 					continue;
> 			}
> 
>+			if (number_addresses == 0) {
>+				*addrstr = '\0';
>+				if (hoststr)
>+					*hoststr = '\0';
>+			}
>+
> 			char *found = strstr(addrstr, tmpbuf);
> 
> 			if (found) {
>@@ -292,9 +311,15 @@ int resolve_host(const char *host, char *addrstr) {
> 				}
> 			}
> 
>+			if (number_addresses > 0) {
>+				strlcat(addrstr, ",", MAX_ADDR_LIST_LEN);
>+				if (hoststr)
>+					strlcat(hoststr, ",", MAX_HOST_LIST_LEN);
>+			}
> 			number_addresses++;
>-			strlcat(addrstr, ",", MAX_ADDR_LIST_LEN);
> 			strlcat(addrstr, tmpbuf, MAX_ADDR_LIST_LEN);
>+			if (hoststr)
>+				strlcat(hoststr, hostname, MAX_HOST_LIST_LEN);
> 		}
> 	}
> 
>@@ -302,3 +327,7 @@ resolve_host_out:
> 	freeaddrinfo(addrlist);
> 	return rc;
> }
>+
>+int resolve_host(const char *host, char *addrstr) {
>+	return resolve_host_with_names(host, addrstr, NULL);
>+}
>diff --git a/resolve_host.h b/resolve_host.h
>index f2b19e6..b507757 100644
>--- a/resolve_host.h
>+++ b/resolve_host.h
>@@ -22,6 +22,7 @@
> #define _RESOLVE_HOST_H_
> 
> #include <arpa/inet.h>
>+#include <resolv.h>
> 
> /* currently maximum length of IPv6 address string */
> #define MAX_ADDRESS_LEN INET6_ADDRSTRLEN
>@@ -31,6 +32,10 @@
> /* limit list of addresses to MAX_ADDRESSES max-size addrs */
> #define MAX_ADDR_LIST_LEN ((MAX_ADDRESS_LEN + 1) * MAX_ADDRESSES)
> 
>+/* limit list of hostnames to MAX_ADDRESSES max-size names */
>+#define MAX_HOST_LIST_LEN ((MAXCDNAME + 1) * MAX_ADDRESSES)
>+
>+extern int resolve_host_with_names(const char *host, char *addrstr, char *hoststr);
> extern int resolve_host(const char *host, char *addrstr);
> 
> #endif /* _RESOLVE_HOST_H_ */
>diff --git a/util.c b/util.c
>index 546f284..c722df5 100644
>--- a/util.c
>+++ b/util.c
>@@ -83,3 +83,17 @@ getusername(uid_t uid)
> 	return username;
> }
> 
>+int
>+iterlist(char **curr, char **next) {
>+    if (!*curr || *curr[0] == '\0' || *curr == *next) {
>+        *curr = *next = NULL;
>+        return 0;
>+    }
>+    *curr = *next ? *next : *curr;
>+    *next = strchr(*curr, ',');
>+    if (*next)
>+        *(*next)++ = '\0';
>+    else
>+        *next = *curr;
>+    return 1;
>+}
>diff --git a/util.h b/util.h
>index 2864130..59e4200 100644
>--- a/util.h
>+++ b/util.h
>@@ -29,5 +29,6 @@ extern size_t strlcpy(char *d, const char *s, size_t bufsize);
> extern size_t strlcat(char *d, const char *s, size_t bufsize);
> 
> extern char *getusername(uid_t uid);
>+extern int iterlist(char **curr, char **next);
> #endif /* _LIBUTIL_H */
>

Actions: View | Diff

Attachments on bug 53188: 17802