Changeset 252

Show
Ignore:
Timestamp:
06/05/09 08:30:19 (9 months ago)
Author:
herwigb
Message:

Fixes for Tickets #74 in 3.2 branch

Location:
branches/samba-3.2.x/source
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/samba-3.2.x/source/build.log

    r137 r252  
    1 Using FLAGS      =  -O -D_SAMBA_BUILD_=3  -IU:/dev/sambasvn/samba/source/iniparser/src -Iinclude -I./include  -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -I./popt   -I/include -IU:/dev/sambasvn/samba/source/lib -D_SAMBA_BUILD_=3 
    2 Generating smbd/build_options.c 
    3 Building include/build_env.h 
    4       PICFLAG    =  
    5       LIBS       =  
    6       LDFLAGS    = -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s 
    7       DYNEXP     =  
    8       LDSHFLAGS  = shared-libraries-disabled  -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s 
    9       SHLIBEXT   = shared_libraries_disabled 
    10       SONAMEFLAG = shared-libraries-disabled 
    11 creating U:/dev/sambasvn/samba/source/winbindd/winbindd_proto.h 
    12 creating U:/dev/sambasvn/samba/source/web/swat_proto.h 
    13 creating U:/dev/sambasvn/samba/source/libnet/libnet_proto.h 
    14 creating U:/dev/sambasvn/samba/source/client/client_proto.h 
    15 creating U:/dev/sambasvn/samba/source/utils/net_proto.h 
    16 creating U:/dev/sambasvn/samba/source/utils/ntlm_auth_proto.h 
    17 Compiling lib/talloc/talloc.c 
    18 Compiling lib/tdb/common/tdb.c 
    19 Compiling lib/tdb/common/dump.c 
    20 Compiling lib/tdb/common/transaction.c 
    21 Compiling lib/tdb/common/error.c 
    22 In file included from lib/talloc/talloc.c:36: 
    23 include/includes.h:803:19: proto.h: No such file or directory 
     1dynconfig.c: In function `get_dyn_CONFIGFILE': 
     2dynconfig.c:105: error: syntax error before "unixroot" 
     3dynconfig.c:106: error: `unixroot' undeclared (first use in this function) 
     4dynconfig.c:106: error: (Each undeclared identifier is reported only once 
     5dynconfig.c:106: error: for each function it appears in.) 
     6dynconfig.c:110: error: syntax error before "tmpdir" 
     7dynconfig.c:112: warning: passing arg 1 of `strncpy' from incompatible pointer type 
     8dynconfig.c:113: warning: passing arg 2 of `setenv' from incompatible pointer type 
     9dynconfig.c:116: warning: passing arg 1 of `strncpy' from incompatible pointer type 
     10dynconfig.c:117: warning: passing arg 1 of `stpcpy' from incompatible pointer type 
     11dynconfig.c:118: warning: passing arg 2 of `setenv' from incompatible pointer type 
    2412The following command failed: 
    25 gcc -I. -IU:/dev/sambasvn/samba/source  -O -D_SAMBA_BUILD_=3  -IU:/dev/sambasvn/samba/source/iniparser/src -Iinclude -I./include  -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -I./popt   -I/include -IU:/dev/sambasvn/samba/source/lib -D_SAMBA_BUILD_=3  -c lib/talloc/talloc.c -o lib/talloc/talloc.o 
    26 Compiling lib/tdb/common/traverse.c 
    27 Compiling lib/tdb/common/freelist.c 
    28 Compiling lib/tdb/common/freelistcheck.c 
    29 Compiling lib/tdb/common/io.c 
    30 make.exe: *** [lib/talloc/talloc.o] Error 1 
    31 make.exe: *** Waiting for unfinished jobs.... 
     13gcc -I. -IU:/Develop/Samba/samba-3.2.x/source -DSMB_PASSWD_FILE="/samba/private/smbpasswd" -DPRIVATE_DIR="/samba/private" -DCONFIGFILE="/samba/lib/smb.conf" -DSBINDIR="/samba/sbin" -DBINDIR="/samba/bin" -DLMHOSTSFILE="/samba/lib/lmhosts" -DSWATDIR="/samba/swat" -DLOCKDIR="/samba/var/locks" -DPIDDIR="/samba/var/locks" -DLIBDIR="/samba/lib" -DLOGFILEBASE="/samba/var" -DSHLIBEXT="shared_libraries_disabled" -DCTDBDIR="" -DCONFIGDIR="/samba/lib" -DCODEPAGEDIR="/samba/lib" -DCACHEDIR="/samba/var/locks" -DSTATEDIR="/samba/var/locks"  -O -D_SAMBA_BUILD_=3  -IU:/Develop/Samba/samba-3.2.x/source/iniparser/src -Iinclude -I./include  -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -I./popt   -I/include -IU:/Develop/Samba/samba-3.2.x/source/lib -D_SAMBA_BUILD_=3  -c dynconfig.c -o dynconfig.o 
     14make: *** [dynconfig.o] Error 1 

  • branches/samba-3.2.x/source/dynconfig.c

    r142 r252  
    100100                snprintf(buffer, 260, "%s/samba/smb.conf", getenv("ETC")); 
    101101        } 
     102 
     103        /* Set UNIXROOT to x:\MPTN if UNIXROOT is undefined */ 
     104        if (getenv("UNIXROOT") == NULL) { 
     105                static char unixroot[1024] = ""; 
     106                strncpy(unixroot,getenv("ETC"),strlen(getenv("ETC"))-4); 
     107                setenv("UNIXROOT",unixroot,0); 
     108        } 
     109        /* Make sure TMPIR points to a proper value */ 
     110        static char tmpdir[1024] = ""; 
     111        if (getenv("TMPDIR") == NULL && getenv("TEMP") != NULL) { 
     112                strncpy(tmpdir,getenv("TEMP"),strlen(getenv("TEMP"))); 
     113                setenv("TMPDIR",tmpdir,0); 
     114        } 
     115        if (getenv("TMPDIR") == NULL) { 
     116                strncpy(tmpdir,getenv("ETC"),2); 
     117                stpcpy(tmpdir,"/OS2/SYSTEM"); 
     118                setenv("TMPDIR",tmpdir,0); 
     119        } 
    102120        if (dyn_CONFIGFILE == NULL) { 
    103                  
    104                 return buffer; 
    105         } 
     121                return buffer; 
     122        } 
     123         
    106124        return dyn_CONFIGFILE; 
    107125}