large files on 32bit centos

eucalyptus · May 30, 2010 · ac8adbc · ac8adbc
1 parent b9d060b
commit ac8adbc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/net/vnetwork.c b/net/vnetwork.c
@@ -65,11 +65,11 @@ permission notice:
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <pthread.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <ifaddrs.h>

diff --git a/node/handlers.c b/node/handlers.c
@@ -69,6 +69,7 @@ permission notice:
 #include <fcntl.h>
 #include <assert.h>
 #include <errno.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <pthread.h>
 #include <sys/vfs.h> /* statfs */

diff --git a/node/handlers_default.c b/node/handlers_default.c
@@ -69,6 +69,7 @@ permission notice:
 #include <fcntl.h>
 #include <assert.h>
 #include <errno.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <pthread.h>
 #include <sys/vfs.h> /* statfs */

diff --git a/storage/storage-windows.c b/storage/storage-windows.c
@@ -3,6 +3,7 @@
 #define __USE_GNU /* strnlen */
 #include <string.h>
 #include <sys/types.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -65,7 +66,7 @@ int decryptWindowsPassword(char *encpass, int encsize, char *pkfile, char **out)
 
 int encryptWindowsPassword(char *pass, char *key, char **out, int *outsize) {
   char *sshkey_dec, *modbuf, *exponentbuf;
-  char *ptr, *tmp, hexstr[2], *enc64;
+  char *ptr, *tmp, hexstr[4], *enc64;
   char *dec64, encpassword[512];
 
   uint32_t len, exponent;
@@ -81,7 +82,7 @@ int encryptWindowsPassword(char *pass, char *key, char **out, int *outsize) {
   if (!sshkey_dec) {
     return(1);
   }
-  
+
   ptr = sshkey_dec;
   memcpy(&len, ptr, 4);
   len = htonl(len);
@@ -121,15 +122,16 @@ int encryptWindowsPassword(char *pass, char *key, char **out, int *outsize) {
     tmp = strndup(ptr, 1);
     if (tmp) {
       len = *tmp;
-      sprintf(hexstr, "%02X", (len<<24)>>24);
+      bzero(hexstr, sizeof(char) * 4);
+      snprintf(hexstr, 3, "%02X", (len<<24)>>24);
       strcat(modbuf, hexstr);
-      ptr++;
+      ptr+=1;
       free(tmp);
     }
   }
-  //  printf("MOD: |%s|\n", modbuf);
-  //  printf("EXPONENT: |%s|\n", exponentbuf);
-    
+  //printf("MOD: |%s|\n", modbuf);
+  //printf("EXPONENT: |%s|\n", exponentbuf);
+
   r = RSA_new();
   if (!r) {
     if (sshkey_dec) free(sshkey_dec);
@@ -184,7 +186,7 @@ int makeWindowsFloppy(char *euca_home, char *rundir_path, char *keyName) {
 
   bzero(password, sizeof(char)*16);
   for (i=0; i<8; i++) {
-    char c[2];
+    char c[4];
     snprintf(c, 2, "%c", RANDALPHANUM);
     strcat(password, c);
   }

diff --git a/storage/storage.c b/storage/storage.c
@@ -62,6 +62,7 @@ permission notice:
 #define __USE_GNU /* strnlen */
 #include <string.h>
 #include <sys/types.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>

diff --git a/util/euca_auth.c b/util/euca_auth.c
@@ -59,6 +59,7 @@ permission notice:
 */
 
 #include <sys/types.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <unistd.h>
 #include <assert.h>

diff --git a/util/ipc.c b/util/ipc.c
@@ -61,6 +61,7 @@ permission notice:
 #include <stdlib.h>
 #include <sys/types.h>
 #include <semaphore.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>

diff --git a/util/misc.c b/util/misc.c
@@ -65,6 +65,7 @@ permission notice:
 #include "misc.h"
 #include <stdarg.h>
 #include <sys/types.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>

diff --git a/util/windows-bundle.c b/util/windows-bundle.c
@@ -10,6 +10,7 @@
 #include <fcntl.h>
 #include <assert.h>
 #include <errno.h>
+#define _FILE_OFFSET_BITS 64
 #include <sys/stat.h>
 #include <pthread.h>
 #include <sys/vfs.h> /* statfs */