From 54cde57c03d54b40886486da0076adf9b2adc834 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 16 Jan 2011 12:26:45 +0100 Subject: [PATCH] s3: Move dump_ntquota* to smbcquotas.c --- source3/include/proto.h | 2 - source3/libsmb/cliquota.c | 75 ----------------------------------- source3/utils/smbcquotas.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 77 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index e58fd73e5f4..76313026c7e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2264,8 +2264,6 @@ NTSTATUS cli_get_fs_quota_info(struct cli_state *cli, int quota_fnum, SMB_NTQUOTA_STRUCT *pqt); NTSTATUS cli_set_fs_quota_info(struct cli_state *cli, int quota_fnum, SMB_NTQUOTA_STRUCT *pqt); -void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, struct dom_sid *sid, bool _numeric)); -void dump_ntquota_list(SMB_NTQUOTA_LIST **qtl, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, struct dom_sid *sid, bool _numeric)); /* The following definitions come from libsmb/clirap.c */ diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c index be52f9b086a..87ca00fd144 100644 --- a/source3/libsmb/cliquota.c +++ b/source3/libsmb/cliquota.c @@ -509,78 +509,3 @@ NTSTATUS cli_set_fs_quota_info(struct cli_state *cli, int quota_fnum, return status; } - -static const char *quota_str_static(uint64_t val, bool special, bool _numeric) -{ - const char *result; - - if (!_numeric&&special&&(val == SMB_NTQUOTAS_NO_LIMIT)) { - return "NO LIMIT"; - } - result = talloc_asprintf(talloc_tos(), "%"PRIu64, val); - SMB_ASSERT(result != NULL); - return result; -} - -void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, struct dom_sid *sid, bool _numeric)) -{ - TALLOC_CTX *frame = talloc_stackframe(); - - if (!qt) { - smb_panic("dump_ntquota() called with NULL pointer"); - } - - switch (qt->qtype) { - case SMB_USER_FS_QUOTA_TYPE: - { - d_printf("File System QUOTAS:\n"); - d_printf("Limits:\n"); - d_printf(" Default Soft Limit: %15s\n",quota_str_static(qt->softlim,True,_numeric)); - d_printf(" Default Hard Limit: %15s\n",quota_str_static(qt->hardlim,True,_numeric)); - d_printf("Quota Flags:\n"); - d_printf(" Quotas Enabled: %s\n", - ((qt->qflags"AS_ENABLED)||(qt->qflags"AS_DENY_DISK))?"On":"Off"); - d_printf(" Deny Disk: %s\n",(qt->qflags"AS_DENY_DISK)?"On":"Off"); - d_printf(" Log Soft Limit: %s\n",(qt->qflags"AS_LOG_THRESHOLD)?"On":"Off"); - d_printf(" Log Hard Limit: %s\n",(qt->qflags"AS_LOG_LIMIT)?"On":"Off"); - } - break; - case SMB_USER_QUOTA_TYPE: - { - fstring username_str = {0}; - - if (_sidtostring) { - _sidtostring(username_str,&qt->sid,_numeric); - } else { - sid_to_fstring(username_str, &qt->sid); - } - - if (_verbose) { - d_printf("Quotas for User: %s\n",username_str); - d_printf("Used Space: %15s\n",quota_str_static(qt->usedspace,False,_numeric)); - d_printf("Soft Limit: %15s\n",quota_str_static(qt->softlim,True,_numeric)); - d_printf("Hard Limit: %15s\n",quota_str_static(qt->hardlim,True,_numeric)); - } else { - d_printf("%-30s: ",username_str); - d_printf("%15s/",quota_str_static(qt->usedspace,False,_numeric)); - d_printf("%15s/",quota_str_static(qt->softlim,True,_numeric)); - d_printf("%15s\n",quota_str_static(qt->hardlim,True,_numeric)); - } - } - break; - default: - d_printf("dump_ntquota() invalid qtype(%d)\n",qt->qtype); - } - TALLOC_FREE(frame); - return; -} - -void dump_ntquota_list(SMB_NTQUOTA_LIST **qtl, bool _verbose, bool _numeric, void (*_sidtostring)(fstring str, struct dom_sid *sid, bool _numeric)) -{ - SMB_NTQUOTA_LIST *cur; - - for (cur = *qtl;cur;cur = cur->next) { - if (cur->quotas) - dump_ntquota(cur->quotas,_verbose,_numeric,_sidtostring); - } -} diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index 8cf1751578f..e2ab52af4aa 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -227,6 +227,105 @@ static int parse_quota_set(TALLOC_CTX *ctx, return 0; } + +static const char *quota_str_static(uint64_t val, bool special, bool _numeric) +{ + const char *result; + + if (!_numeric&&special&&(val == SMB_NTQUOTAS_NO_LIMIT)) { + return "NO LIMIT"; + } + result = talloc_asprintf(talloc_tos(), "%"PRIu64, val); + SMB_ASSERT(result != NULL); + return result; +} + +static void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, + bool _numeric, + void (*_sidtostring)(fstring str, + struct dom_sid *sid, + bool _numeric)) +{ + TALLOC_CTX *frame = talloc_stackframe(); + + if (!qt) { + smb_panic("dump_ntquota() called with NULL pointer"); + } + + switch (qt->qtype) { + case SMB_USER_FS_QUOTA_TYPE: + { + d_printf("File System QUOTAS:\n"); + d_printf("Limits:\n"); + d_printf(" Default Soft Limit: %15s\n", + quota_str_static(qt->softlim,True,_numeric)); + d_printf(" Default Hard Limit: %15s\n", + quota_str_static(qt->hardlim,True,_numeric)); + d_printf("Quota Flags:\n"); + d_printf(" Quotas Enabled: %s\n", + ((qt->qflags"AS_ENABLED) + ||(qt->qflags"AS_DENY_DISK))?"On":"Off"); + d_printf(" Deny Disk: %s\n", + (qt->qflags"AS_DENY_DISK)?"On":"Off"); + d_printf(" Log Soft Limit: %s\n", + (qt->qflags"AS_LOG_THRESHOLD)?"On":"Off"); + d_printf(" Log Hard Limit: %s\n", + (qt->qflags"AS_LOG_LIMIT)?"On":"Off"); + } + break; + case SMB_USER_QUOTA_TYPE: + { + fstring username_str = {0}; + + if (_sidtostring) { + _sidtostring(username_str,&qt->sid,_numeric); + } else { + sid_to_fstring(username_str, &qt->sid); + } + + if (_verbose) { + d_printf("Quotas for User: %s\n",username_str); + d_printf("Used Space: %15s\n", + quota_str_static(qt->usedspace,False, + _numeric)); + d_printf("Soft Limit: %15s\n", + quota_str_static(qt->softlim,True, + _numeric)); + d_printf("Hard Limit: %15s\n", + quota_str_static(qt->hardlim,True,_numeric)); + } else { + d_printf("%-30s: ",username_str); + d_printf("%15s/",quota_str_static( + qt->usedspace,False,_numeric)); + d_printf("%15s/",quota_str_static( + qt->softlim,True,_numeric)); + d_printf("%15s\n",quota_str_static( + qt->hardlim,True,_numeric)); + } + } + break; + default: + d_printf("dump_ntquota() invalid qtype(%d)\n",qt->qtype); + } + TALLOC_FREE(frame); + return; +} + +static void dump_ntquota_list(SMB_NTQUOTA_LIST **qtl, bool _verbose, + bool _numeric, + void (*_sidtostring)(fstring str, + struct dom_sid *sid, + bool _numeric)) +{ + SMB_NTQUOTA_LIST *cur; + + for (cur = *qtl;cur;cur = cur->next) { + if (cur->quotas) + dump_ntquota(cur->quotas,_verbose,_numeric, + _sidtostring); + } +} + static int do_quota(struct cli_state *cli, enum SMB_QUOTA_TYPE qtype, uint16 cmd, -- 2.11.4.GIT