r408: - replace (conn->admin_user != True) with (current_user.uid != 0)

  because someone changed it in all other places too

- fix quotas support from windows explorer
  we now got the unix file name of a fake_file

metze
(This used to be commit 87e97d7723674e3835578ef080ce554d9c5537ac)

diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 3fe60072e9ee96fa5598ac1ae544e0098b749f76..cfcd16f683009fb2f2aea934b6a6e8ed457d924f 100644 (file)
--- a/source3/include/fake_file.h
+++ b/source3/include/fake_file.h
@@ -26,7 +26,11 @@ enum FAKE_FILE_TYPE {
        FAKE_FILE_TYPE_QUOTA    
 };
 
+/*
+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"
 
 typedef struct _FAKE_FILE_HANDLE {
        enum FAKE_FILE_TYPE type;

diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c
index 5ccb548ba5bd530475cf532c3489290aea233cc6..d3660addf1153f0ccda044650f895338d052dd5a 100644 (file)
--- a/source3/smbd/fake_file.c
+++ b/source3/smbd/fake_file.c
@@ -40,7 +40,7 @@ files_struct *open_fake_file_shared1(enum FAKE_FILE_TYPE fake_file_type, connect
        }
 
        /* access check */
-       if (conn->admin_user != True) {
+       if (current_user.uid != 0) {
                DEBUG(1,("access_denied to service[%s] file[%s] user[%s]\n",
                        lp_servicename(SNUM(conn)),fname,conn->user));
                errno = EACCES;

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 6ba74d5d5034560e69272211f57712ff25ba91da..e4ffec339b7ab9f88d43af8ff97eb874eefb178b 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2351,7 +2351,7 @@ static int call_nt_transact_set_user_quota(connection_struct *conn, char *inbuf,
        ZERO_STRUCT(qt);
 
        /* access check */
-       if (conn->admin_user != True) {
+       if (current_user.uid != 0) {
                DEBUG(1,("set_user_quota: access_denied service [%s] user [%s]\n",
                        lp_servicename(SNUM(conn)),conn->user));
                return ERROR_DOS(ERRDOS,ERRnoaccess);

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a1d068e38f9d47c1fdb16e62c84c50c98984ad6b..0d84c400653a9eaeaf5dbb58f9506f9913473f67 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2010,7 +2010,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        fsp.fd = -1;
                        
                        /* access check */
-                       if (conn->admin_user != True) {
+                       if (current_user.uid != 0) {
                                DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
                                        lp_servicename(SNUM(conn)),conn->user));
                                return ERROR_DOS(ERRDOS,ERRnoaccess);
@@ -2108,7 +2108,7 @@ static int call_trans2setfsinfo(connection_struct *conn,
        DEBUG(10,("call_trans2setfsinfo: SET_FS_QUOTA: for service [%s]\n",lp_servicename(SNUM(conn))));
 
        /* access check */
-       if ((conn->admin_user != True)||!CAN_WRITE(conn)) {
+       if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
                DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
                        lp_servicename(SNUM(conn)),conn->user));
                return ERROR_DOS(ERRSRV,ERRaccess);