From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 27 Mar 2011 20:06:27 +0000 (+0100)
Subject: Windows: Don't use %I for IP addresses
X-Git-Tag: upstream/1.8.0_pre1^2~3977
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a58639ee7b4c80de9f7c177549639cbf18b71e14;p=packages%2Fo%2Fopenafs.git

Windows: Don't use %I for IP addresses

%I isn't supported by the roken printf functions. In preparation
for switching over to them, replace our use of asprintf to convert
IP addresses to strings with the afs_inet_ntoa_r function.

Change-Id: Id38dc56405071d62fb2b12e4f69905aa7a2026b0
Reviewed-on: http://gerrit.openafs.org/4362
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 618f792b8..530ad89a2 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -2009,7 +2009,9 @@ int cm_DumpSCache(FILE *outputFile, char *cookie, int lock)
         if (scp->cbServerp) {
             if (!((scp->cbServerp->flags & CM_SERVERFLAG_UUID) &&
                 UuidToString((UUID *)&scp->cbServerp->uuid, &srvStr) == RPC_S_OK)) {
-                afs_asprintf(&srvStr, "%.0I", scp->cbServerp->addr.sin_addr.s_addr);
+                srvStr = malloc(16); /* enough for 255.255.255.255 */
+                if (srvStr != NULL)
+                    afs_inet_ntoa_r(scp->cbServerp->addr.sin_addr.s_addr, srvStr);
                 srvStrRpc = FALSE;
             }
         }
diff --git a/src/WINNT/afsd/cm_volume.c b/src/WINNT/afsd/cm_volume.c
index 5449d2331..33576504c 100644
--- a/src/WINNT/afsd/cm_volume.c
+++ b/src/WINNT/afsd/cm_volume.c
@@ -1508,7 +1508,9 @@ int cm_DumpVolumes(FILE *outputFile, char *cookie, int lock)
         if (volp->cbServerpRO) {
             if (!((volp->cbServerpRO->flags & CM_SERVERFLAG_UUID) &&
                 UuidToString((UUID *)&volp->cbServerpRO->uuid, &srvStr) == RPC_S_OK)) {
-                afs_asprintf(&srvStr, "%.0I", volp->cbServerpRO->addr.sin_addr.s_addr);
+                srvStr = malloc(16);
+                if (srvStr != NULL)
+                    afs_inet_ntoa_r(volp->cbServerpRO->addr.sin_addr.s_addr, srvStr);
                 srvStrRpc = FALSE;
             }
         }