[PATCH] Backport code from Fedora to enable ks on ftp server with password (#505424)

[Martin Sivak <msivak@xxxxxxxxxx>]

---
 loader2/kickstart.c |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 loader2/kickstart.h |    1 +
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/loader2/kickstart.c b/loader2/kickstart.c
index 6768fab..cd327c2 100644
--- a/loader2/kickstart.c
+++ b/loader2/kickstart.c
@@ -301,15 +301,17 @@ int getKickstartFromBlockDevice(char *device, char *path) {
     return getFileFromBlockDevice(device, path, "/tmp/ks.cfg");
 }
 
-void getHostandPath(char * ksSource, char **host, char ** file, char * ip) {
-    *host = malloc(strlen(ksSource) + 1);
-    strcpy(*host, ksSource);
+void getHostPathandLogin(char * ksSource, char **host, char ** file, char ** login, char ** password, char * ip) {
+    char *tmp;
+    char *hostsrc;
 
-    *file = strchr(*host, '/');
+    hostsrc = strdup(ksSource);
+    *host = hostsrc;
+    tmp = strchr(*host, '/');
 
-    if (*file) {
-        **file = '\0';
-        *file = *file + 1;
+    if (tmp) {
+        *file = strdup(tmp);
+        *tmp = '\0';
     } else {
         *file = malloc(sizeof(char *));
         **file = '\0';
@@ -325,6 +327,39 @@ void getHostandPath(char * ksSource, char **host, char ** file, char * ip) {
         *file = sdupprintf("%s%s-kickstart", *file, ip);
         logMessage(DEBUGLVL, "getHostandPath file(2): |%s|", *file);
     }
+
+    /* Do we have a password? */
+    tmp = strchr(*host, '@');
+    if (tmp != NULL) {
+        *login = *host;
+        *tmp = '\0';
+        *host = tmp + 1;
+
+        tmp = strchr(*login, ':');
+        if (tmp != NULL) {
+            *password = strdup(tmp + 1);
+            *tmp = '\0';
+        } else {
+            *password = malloc(sizeof(char *));
+            **password = '\0';
+        }
+
+	*host = strdup(*host);
+	*login = strdup(*login);
+	free(hostsrc);
+    } else {
+        *login = malloc(sizeof(char *));
+        **login = '\0';
+        *password = malloc(sizeof(char *));
+        **password = '\0';
+	free(hostsrc);
+    }
+
+}
+
+void getHostandPath(char * ksSource, char **host, char ** file, char * ip) {
+    char *password, *login;
+    getHostPathandLogin (ksSource, host, file, &login, &password, ip);
 }
 
 static char *newKickstartLocation(const char *origLocation) {
diff --git a/loader2/kickstart.h b/loader2/kickstart.h
index 69ba3be..a963479 100644
--- a/loader2/kickstart.h
+++ b/loader2/kickstart.h
@@ -29,5 +29,6 @@ void getKickstartFile(struct loaderData_s * loaderData);
 void runKickstart(struct loaderData_s * loaderData);
 int getKickstartFromBlockDevice(char *device, char *path);
 void getHostandPath(char * ksSource, char **host, char ** file, char * ip);
+void getHostPathandLogin(char * ksSource, char **host, char ** file, char ** login, char ** password, char * ip);
 
 #endif
-- 
1.6.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list