Changeset 108 for branches


Ignore:
Timestamp:
Dec 11, 2007, 9:44:35 AM (18 years ago)
Author:
Paul Smedley
Message:

test fix for Ticket #9

Location:
branches/samba-3.0/source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/samba-3.0/source/VERSION

    r105 r108  
    2626SAMBA_VERSION_MAJOR=3
    2727SAMBA_VERSION_MINOR=0
    28 SAMBA_VERSION_RELEASE=27
     28SAMBA_VERSION_RELEASE=28
    2929
    3030########################################################
    … …  
    3737#  ->  "2.2.8a"                                        #
    3838########################################################
    39 SAMBA_VERSION_REVISION=a
     39SAMBA_VERSION_REVISION=
    4040
    4141########################################################
    … …  
    9797########################################################
    9898SAMBA_VERSION_VENDOR_SUFFIX=
    99 SAMBA_VENDOR_PATCH=
     99SAMBA_VERSION_VENDOR_PATCH=

  • branches/samba-3.0/source/auth/auth_util.c

    r105 r108  
    957957
    958958                if (!NT_STATUS_IS_OK(status)) {
     959                        unbecome_root();
    959960                        TALLOC_FREE(result);
    960961                        return NULL;
    … …  
    966967
    967968                if (!NT_STATUS_IS_OK(status)) {
     969                        unbecome_root();
    968970                        TALLOC_FREE(result);
    969971                        return NULL;

  • branches/samba-3.0/source/include/version.h

    r105 r108  
    22#define SAMBA_VERSION_MAJOR 3
    33#define SAMBA_VERSION_MINOR 0
    4 #define SAMBA_VERSION_RELEASE 27
    5 #define SAMBA_VERSION_REVISION "a"
    6 #define SAMBA_VERSION_OFFICIAL_STRING "3.0.27a"
     4#define SAMBA_VERSION_RELEASE 28
     5#define SAMBA_VERSION_OFFICIAL_STRING "3.0.28"
    76#define SAMBA_VERSION_STRING samba_version_string()

  • branches/samba-3.0/source/lib/version.c

    r105 r108  
    2929        static fstring samba_version;
    3030        static BOOL init_samba_version;
    31 #ifdef SAMBA_VENDOR_PATCH
     31#ifdef SAMBA_VERSION_VENDOR_PATCH
    3232        fstring tmp_version;
    3333        size_t remaining;
    … …  
    4141                SAMBA_VERSION_VENDOR_SUFFIX);
    4242
    43 #ifdef SAMBA_VENDOR_PATCH
     43#ifdef SAMBA_VERSION_VENDOR_PATCH
    4444        remaining = sizeof(samba_version)-strlen(samba_version);
    45         snprintf( tmp_version, sizeof(tmp_version),  "-%d", SAMBA_VENDOR_PATCH );
     45        snprintf( tmp_version, sizeof(tmp_version),  "-%d", SAMBA_VERSION_VENDOR_PATCH);
    4646        strlcat( samba_version, tmp_version, remaining-1 );
    4747#endif

  • branches/samba-3.0/source/libsmb/clidgram.c

    r26 r108  
    7373        ptr -= 4; /* XXX Ugliness because of handling of tcp SMB length. */
    7474        memcpy(tmp,ptr,4);
     75
     76        if (smb_size + 17*2 + strlen(mailslot) + 1 + len > MAX_DGRAM_SIZE) {
     77                DEBUG(0, ("cli_send_mailslot: Cannot write beyond end of packet\n"));
     78                return False;
     79        }
     80
    7581        set_message(ptr,17,strlen(mailslot) + 1 + len,True);
    7682        memcpy(ptr,tmp,4);

  • branches/samba-3.0/source/nmbd/nmbd_packets.c

    r102 r108  
    18931893        ptr -= 4; /* XXX Ugliness because of handling of tcp SMB length. */
    18941894        memcpy(tmp,ptr,4);
     1895
     1896        if (smb_size + 17*2 + strlen(mailslot) + 1 + len > MAX_DGRAM_SIZE) {
     1897                DEBUG(0, ("send_mailslot: Cannot write beyond end of packet\n"));
     1898                return False;
     1899        }
     1900
    18951901        set_message(ptr,17,strlen(mailslot) + 1 + len,True);
    18961902        memcpy(ptr,tmp,4);

  • branches/samba-3.0/source/smbd/service.c

    r26 r108  
    6262#ifndef __OS2__
    6363        *d++ = '/'; /* Always start with root. */
    64 #else
    65         if ((connectpath[0]=='/')||(connectpath[0]=='\\'))
    66             *d++ = '/'; /* Start with root if connectpath is not a drive path. */
    67 #endif
    6864
    6965        while (*s) {
    … …  
    152148        *d = '\0';
    153149
    154 #ifndef __OS2__
    155150        /* And must not end in '/' */
    156151        if (d > destname + 1 && (*(d-1) == '/')) {
    … …  
    158153        }
    159154#else
    160         /* Must not end in '/' if we are sharing a drive letter on OS/2 */
    161         if (d > destname + 1 && (*(d-1) == ':')) {
    162                 *(d) = '/';
    163         }
    164 
    165 #endif
     155        /* Assume OS/2 users are smart enough to put a correct path in smb.conf, and simply copy the string */
     156        pstrcpy(destname, connectpath);
     157#endif 
    166158
    167159        DEBUG(10,("set_conn_connectpath: service %s, connectpath = %s\n",
Note: See TracChangeset for help on using the changeset viewer.