Merge from branch_2_1 to branch_3_0, also for glite.jobid

diff --git a/org.glite.jobid.api-c/project/ChangeLog b/org.glite.jobid.api-c/project/ChangeLog
index f61346c..851b108 100644 (file)
--- a/org.glite.jobid.api-c/project/ChangeLog
+++ b/org.glite.jobid.api-c/project/ChangeLog
@@ -30,6 +30,9 @@
 - Support for IPv6 literal addresses
 - Fixed notification ID parsing
 
+1.0.7-1
+- Handling error returned by gethostbyname() (Savannah Bug #67627)
+
 2.0.0-1
 - Version numbering fixed
 

diff --git a/org.glite.jobid.api-c/src/cjobid.c b/org.glite.jobid.api-c/src/cjobid.c
index bfd4203..57da65c 100644 (file)
--- a/org.glite.jobid.api-c/src/cjobid.c
+++ b/org.glite.jobid.api-c/src/cjobid.c
@@ -51,6 +51,7 @@ int glite_jobid_recreate(const char* bkserver, int port, const char *unique, gli
     struct timeval tv;
     int skip;
     char* portbeg;
+    char* rndaddr = NULL;
 
     struct hostent* he;
 
@@ -58,16 +59,17 @@ int glite_jobid_recreate(const char* bkserver, int port, const char *unique, gli
         return EINVAL;
 
     if (unique == NULL) {
-       gethostname(hostname, 100);
-       he = gethostbyname(hostname);
-       assert(he->h_length > 0);
        gettimeofday(&tv, NULL);
        srandom(tv.tv_usec);
+       gethostname(hostname, 100);
+       he = gethostbyname(hostname);
+       if (!he) asprintf(&rndaddr,"%d.%d.%d.%d",rand()%256,rand()%256,rand()%256,rand()%256);
 
        skip = strlen(hostname);
        skip += sprintf(hostname + skip, "-IP:0x%x-pid:%d-rnd:%d-time:%d:%d",
-                   *((int*)he->h_addr_list[0]), getpid(), (int)random(),
-                   (int)tv.tv_sec, (int)tv.tv_usec);
+                   rndaddr ? rndaddr : *((int*)he->h_addr_list[0]),
+                   getpid(), (int)random(), (int)tv.tv_sec, (int)tv.tv_usec);
+       free(rndaddr);
     }
 
     *jobId = NULL;

diff --git a/org.glite.jobid.api-cpp/project/ChangeLog b/org.glite.jobid.api-cpp/project/ChangeLog
index d052ca3..f0d8bab 100644 (file)
--- a/org.glite.jobid.api-cpp/project/ChangeLog
+++ b/org.glite.jobid.api-cpp/project/ChangeLog
@@ -20,6 +20,9 @@
 1.0.1-2
 - Module rebuilt
 
+1.0.1-3
+- Module rebuilt
+
 1.1.0-1
 - Fixes for parallel release in EMI & gLite
 

diff --git a/org.glite.jobid.api-java/project/ChangeLog b/org.glite.jobid.api-java/project/ChangeLog
index 8ff359c..51e9b5c 100644 (file)
--- a/org.glite.jobid.api-java/project/ChangeLog
+++ b/org.glite.jobid.api-java/project/ChangeLog
@@ -10,6 +10,9 @@
 1.0.3-2
 - Module rebuilt
 
+1.0.4-1
+- Makefile using external modules jakarta-commons-*
+
 1.1.0-1
 - Fixes for parallel release in EMI & gLite