← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/samba/oneiric-security

« back to all changes in this revision

Viewing changes to source/smbd/quotas.c

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-07-21 17:53:23 UTC
  • mfrom: (0.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050721175323-m3oh6aoigywohfnq
Tags: 3.0.14a-6ubuntu1
Resynchronise with Debian, resolving merge conflicts (#12360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/smbd/quotas.c
471
471
 
472
472
        len=strcspn(mnttype, ":");
473
473
        pathname=strstr(mnttype, ":");
474
 
        cutstr = (char *) malloc(len+1);
 
474
        cutstr = (char *) SMB_MALLOC(len+1);
475
475
        if (!cutstr)
476
476
                return False;
477
477
 
938
938
#include <rpc/rpc.h>
939
939
#include <rpc/types.h>
940
940
#include <rpcsvc/rquota.h>
 
941
#ifdef HAVE_RPC_NETTYPE_H
941
942
#include <rpc/nettype.h>
 
943
#endif
942
944
#include <rpc/xdr.h>
943
945
 
944
946
static int quotastat;
1000
1002
 
1001
1003
        len=strcspn(mnttype, ":");
1002
1004
        pathname=strstr(mnttype, ":");
1003
 
        cutstr = (char *) malloc(len+1);
 
1005
        cutstr = (char *) SMB_MALLOC(len+1);
1004
1006
        if (!cutstr)
1005
1007
                return False;
1006
1008