svn commit: samba r2389 - in trunk/source: include libsmb smbd utils

[metze]

Author: metze
Date: 2004-09-17 15:12:52 +0000 (Fri, 17 Sep 2004)
New Revision: 2389

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source&rev=2389&nolog=1

Log:
merge from 3.0 -r 2388:
fix client quota support

for the client we need the windows path and for server we need unix path

metze

Modified:
   trunk/source/include/fake_file.h
   trunk/source/libsmb/cliquota.c
   trunk/source/smbd/fake_file.c
   trunk/source/utils/smbcquotas.c


Changeset:
Modified: trunk/source/include/fake_file.h
===================================================================
--- trunk/source/include/fake_file.h    2004-09-17 15:09:20 UTC (rev 2388)
+++ trunk/source/include/fake_file.h    2004-09-17 15:12:52 UTC (rev 2389)
@@ -28,9 +28,9 @@
 
 /*
 we now get the unix name --metze
-#define FAKE_FILE_NAME_QUOTA   "\\$Extend\\$Quota:$Q:$INDEX_ALLOCATION"
 */
-#define FAKE_FILE_NAME_QUOTA   "$Extend/$Quota:$Q:$INDEX_ALLOCATION"
+#define FAKE_FILE_NAME_QUOTA_WIN32     "\\$Extend\\$Quota:$Q:$INDEX_ALLOCATION"
+#define FAKE_FILE_NAME_QUOTA_UNIX      "$Extend/$Quota:$Q:$INDEX_ALLOCATION"
 
 typedef struct _FAKE_FILE_HANDLE {
        enum FAKE_FILE_TYPE type;

Modified: trunk/source/libsmb/cliquota.c
===================================================================
--- trunk/source/libsmb/cliquota.c      2004-09-17 15:09:20 UTC (rev 2388)
+++ trunk/source/libsmb/cliquota.c      2004-09-17 15:12:52 UTC (rev 2389)
@@ -22,13 +22,13 @@
 
 BOOL cli_get_quota_handle(struct cli_state *cli, int *quota_fnum)
 {
-       *quota_fnum = cli_nt_create_full(cli, FAKE_FILE_NAME_QUOTA,
+       *quota_fnum = cli_nt_create_full(cli, FAKE_FILE_NAME_QUOTA_WIN32,
                 0x00000016, DESIRED_ACCESS_PIPE,
                 0x00000000, FILE_SHARE_READ|FILE_SHARE_WRITE,
                 FILE_OPEN, 0x00000000, 0x03);
                 
        if (*quota_fnum == (-1)) {
-               return False;   
+               return False;
        }
 
        return True;

Modified: trunk/source/smbd/fake_file.c
===================================================================
--- trunk/source/smbd/fake_file.c       2004-09-17 15:09:20 UTC (rev 2388)
+++ trunk/source/smbd/fake_file.c       2004-09-17 15:12:52 UTC (rev 2389)
@@ -95,9 +95,9 @@
 
 static FAKE_FILE fake_files[] = {
 #ifdef WITH_QUOTAS
-       {FAKE_FILE_NAME_QUOTA,  FAKE_FILE_TYPE_QUOTA,   init_quota_handle,      
destroy_quota_handle},
+       {FAKE_FILE_NAME_QUOTA_UNIX,     FAKE_FILE_TYPE_QUOTA,   init_quota_handle,     
 destroy_quota_handle},
 #endif /* WITH_QUOTAS */
-       {NULL,                  FAKE_FILE_TYPE_NONE,    NULL,                   NULL }
+       {NULL,                          FAKE_FILE_TYPE_NONE,    NULL,                  
 NULL }
 };
 
 int is_fake_file(char *fname)
@@ -156,7 +156,7 @@
 void destroy_fake_file_handle(FAKE_FILE_HANDLE **fh)
 {
        if (!fh||!(*fh))
-               return ;
+               return;
 
        if ((*fh)->free_pd)
                (*fh)->free_pd(&(*fh)->pd);             

Modified: trunk/source/utils/smbcquotas.c
===================================================================
--- trunk/source/utils/smbcquotas.c     2004-09-17 15:09:20 UTC (rev 2388)
+++ trunk/source/utils/smbcquotas.c     2004-09-17 15:12:52 UTC (rev 2389)
@@ -236,8 +236,9 @@
        }
 
        if (!cli_get_quota_handle(cli, &quota_fnum)) {
-               d_printf("Failed to open \\%s  %s.\n",
-                       FAKE_FILE_NAME_QUOTA,cli_errstr(cli));
+               d_printf("Quotas are not enabled on this share.\n");
+               d_printf("Failed to open %s  %s.\n",
+                       FAKE_FILE_NAME_QUOTA_WIN32,cli_errstr(cli));
                return -1;
        }