Attachment 66576 Details for Bug 147691

[patch] kdelibs3 patch

kdelibs_kdesystemhostname.patch (text/plain), 5.85 KB, created by Lubos Lunak on 2006-02-06 16:48:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2006-02-06 16:48:36 UTC

Size: 5.85 KB

patch

obsolete

>--- kdelibs/kinit/wrapper.c.sav	2005-09-29 21:31:28.000000000 +0200
>+++ kdelibs/kinit/wrapper.c	2006-02-06 16:22:58.000000000 +0100
>@@ -164,7 +164,9 @@
>      sock_file[strlen(sock_file)-1] = 0;
>   
>   strncat(sock_file, "/socket-", MAX_SOCK_FILE - strlen(sock_file));
>-  if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
>+  if( getenv("KDESYSTEMHOSTNAME"))
>+      strncat(sock_file, getenv("KDESYSTEMHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1);
>+  else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
>   {
>      perror("Warning: Could not determine hostname: ");
>      return -1;
>--- kdelibs/kinit/lnusertemp.c.sav	2005-09-29 21:31:28.000000000 +0200
>+++ kdelibs/kinit/lnusertemp.c	2006-02-06 16:40:32.000000000 +0100
>@@ -39,7 +39,7 @@
> 
> int check_tmp_dir(const char *tmp_dir);
> int create_link(const char *file, const char *tmp_dir);
>-int build_link(const char *tmp_prefix, const char *kde_prefix);
>+int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname);
> 
> int check_tmp_dir(const char *tmp_dir)
> {
>@@ -89,7 +89,7 @@
> }
> 
> 
>-int build_link(const char *tmp_prefix, const char *kde_prefix)
>+int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
> {
>   struct passwd *pw_ent;
>   char kde_tmp_dir[PATH_MAX+1];
>@@ -156,10 +156,21 @@
>   }  
> 
>   strncat(kde_tmp_dir, kde_prefix, PATH_MAX - strlen(kde_tmp_dir));
>-  if (gethostname(kde_tmp_dir+strlen(kde_tmp_dir), PATH_MAX - strlen(kde_tmp_dir) - 1) != 0)
>+
>+  if( kdehostname )
>+  {
>+      if( getenv("KDESYSTEMHOSTNAME"))
>+          strncat(kde_tmp_dir+strlen(kde_tmp_dir), getenv("KDESYSTEMHOSTNAME"), PATH_MAX - strlen(kde_tmp_dir) - 1);
>+      else
>+          return 0;
>+  }
>+  else
>   {
>-     perror("Aborting. Could not determine hostname: ");
>-     exit(255);
>+     if (gethostname(kde_tmp_dir+strlen(kde_tmp_dir), PATH_MAX - strlen(kde_tmp_dir) - 1) != 0)
>+     {
>+        perror("Could not determine hostname: ");
>+        return 1;
>+     }
>   }
>   kde_tmp_dir[sizeof(kde_tmp_dir)-1] = '\0';
> 
>@@ -266,7 +277,9 @@
>     kde_prefix = "/cache-"; 
>   }
> 
>-  res = build_link(tmp_prefix, kde_prefix); 
>+  res = build_link(tmp_prefix, kde_prefix, 1); 
>+  if( !build_link(tmp_prefix, kde_prefix, 0))
>+    res = 1;
>     
>   free(tmp_prefix);
> 
>--- kdelibs/kdecore/kstandarddirs.cpp.sav	2005-09-29 21:31:55.000000000 +0200
>+++ kdelibs/kdecore/kstandarddirs.cpp	2006-02-06 16:20:52.000000000 +0100
>@@ -718,7 +718,10 @@
> {
>    char hostname[256];
>    hostname[0] = 0;
>-   gethostname(hostname, 255);
>+   if( getenv("KDESYSTEMHOSTNAME"))
>+       strlcpy(hostname, getenv("KDESYSTEMHOSTNAME"), 255 );
>+   else
>+       gethostname(hostname, 255);
>    QString dir = QString("%1%2-%3").arg(localkdedir()).arg(type).arg(hostname);
>    char link[1024];
>    link[1023] = 0;
>--- kdelibs/kdecore/kcrash.cpp.sav	2006-01-23 14:38:21.000000000 +0100
>+++ kdelibs/kdecore/kcrash.cpp	2006-02-06 16:23:22.000000000 +0100
>@@ -461,7 +461,9 @@
>      sock_file[strlen(sock_file)-1] = 0;
>   
>   strncat(sock_file, "/socket-", MAX_SOCK_FILE - strlen(sock_file));
>-  if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
>+  if( getenv("KDESYSTEMHOSTNAME"))
>+      strncat(sock_file, getenv("KDESYSTEMHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1);
>+  else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
>   {
>      perror("Warning: Could not determine hostname: ");
>      return -1;
>--- kdelibs/dcop/dcopserver_shutdown.c.sav	2005-09-29 21:32:08.000000000 +0200
>+++ kdelibs/dcop/dcopserver_shutdown.c	2006-02-06 16:17:37.000000000 +0100
>@@ -95,7 +95,9 @@
>   strncat(dcop_file, "/.DCOPserver_", n);
>   n -= strlen("/.DCOPserver_");
> 
>-  if (gethostname(dcop_file+strlen(dcop_file), n) != 0)
>+  if (getenv("KDESYSTEMHOSTNAME"))
>+     strncat(dcop_file+strlen(dcop_file), getenv("KDESYSTEMHOSTNAME"), n);
>+  else if (gethostname(dcop_file+strlen(dcop_file), n) != 0)
>   {
>      perror("Error. Could not determine hostname: ");
>      dcop_file[0] = '\0';
>--- kdelibs/dcop/dcopc.c.sav	2005-05-04 13:06:07.000000000 +0200
>+++ kdelibs/dcop/dcopc.c	2006-02-06 16:19:40.000000000 +0100
>@@ -684,7 +684,9 @@
>     }
> 
>     hostName[0] = '\0';
>-    if (gethostname(hostName, sizeof(hostName)))
>+    if (getenv("KDESYSTEMHOSTNAME"))
>+            strlcpy(hostName, getenv("KDESYSTEMHOSTNAME"),sizeof(hostName)-1);
>+    else if (gethostname(hostName, sizeof(hostName)))
> 	    strcpy(hostName, "localhost");
>     else
> 	    hostName[sizeof(hostName)-1] = '\0';
>--- kdelibs/dcop/dcopclient.cpp.sav	2005-11-30 16:54:04.000000000 +0100
>+++ kdelibs/dcop/dcopclient.cpp	2006-02-06 16:18:30.000000000 +0100
>@@ -275,7 +275,9 @@
>     {
>         char hostName[256];
>         hostName[0] = '\0';
>-        if (gethostname(hostName, sizeof(hostName)))
>+        if (getenv("KDESYSTEMHOSTNAME"))
>+            fName += getenv("KDESYSTEMHOSTNAME");
>+        else if (gethostname(hostName, sizeof(hostName)))
>         {
>             fName += "localhost";
>         }
>--- kdelibs/kded/khostname.cpp.sav	2006-02-06 15:39:09.000000000 +0100
>+++ kdelibs/kded/khostname.cpp	2006-02-06 17:46:35.000000000 +0100
>@@ -36,6 +36,7 @@
> #include <kstandarddirs.h>
> #include <kprocess.h>
> #include <kde_file.h>
>+#include <kdebug.h>
> 
> static KCmdLineOptions options[] = {
>    { "+old", I18N_NOOP("Old hostname"), 0 },
>@@ -155,9 +156,9 @@
>          continue;
> 
>       QCString newNetId = newName+netId.mid(i);
>-
>-      cmd = "xauth remove "+KProcess::quote(netId);
>-      system(QFile::encodeName(cmd));
>+      
>+//      cmd = "xauth remove "+KProcess::quote(netId);
>+//      system(QFile::encodeName(cmd));
>       cmd = "xauth add ";
>       cmd += KProcess::quote(newNetId);
>       cmd += " ";
>@@ -364,9 +365,7 @@
> 
>    KHostName hn;
> 
>-   if(!getenv("XAUTHLOCALHOSTNAME"))
>-       hn.changeX();
>-
>+   hn.changeX();
>    hn.changeDcop();
>    hn.changeStdDirs("socket");
>    hn.changeStdDirs("tmp");

Actions: View | Diff

Attachments on bug 147691: 66576 | 66577 | 66586 | 66589