Update my copyrights according to my agreement with IBM

[bbaumbach/samba-autobuild/.git] / source3 / libads / disp_sec.c

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index c6fe0862c9b36a650f93dfe2c787d1ba4927cea3..c9de447e698dfc4122a5f958a1c19cee529a086c 100644 (file)
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0.
+   Unix SMB/CIFS implementation.
    Samba utility functions. ADS stuff
    Copyright (C) Alexey Kotovich 2002
    
@@ -21,11 +20,9 @@
 
 #include "includes.h"
 
-#ifdef HAVE_ADS
-
 static struct perm_mask_str {
        uint32  mask;
-       char   *str;
+       const char   *str;
 } perms[] = {
        {SEC_RIGHTS_FULL_CTRL,          "[Full Control]"},
 
@@ -53,7 +50,7 @@ static struct perm_mask_str {
 };
 
 /* convert a security permissions into a string */
-void ads_disp_perms(uint32 type)
+static void ads_disp_perms(uint32 type)
 {
        int i = 0;
        int j = 0;
@@ -83,22 +80,10 @@ void ads_disp_perms(uint32 type)
        puts("");
 }
 
-/* Check if ACE has OBJECT type */
-BOOL ads_ace_object(uint8 type)
-{
-       if (type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT ||
-            type == SEC_ACE_TYPE_ACCESS_DENIED_OBJECT ||
-            type == SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT ||
-            type == SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT) {
-               return True;
-       }
-       return False;
-}
-
 /* display ACE */
-void ads_disp_ace(SEC_ACE *sec_ace)
+static void ads_disp_ace(SEC_ACE *sec_ace)
 {
-       char *access_type = "UNKNOWN";
+       const char *access_type = "UNKNOWN";
 
        if (!sec_ace_object(sec_ace->type)) {
                printf("------- ACE (type: 0x%02x, flags: 0x%02x, size: 0x%02x, mask: 0x%x)\n", 
@@ -124,7 +109,7 @@ void ads_disp_ace(SEC_ACE *sec_ace)
        } else if (sec_ace->type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT) {
                access_type = "ALLOWED OBJECT";
        } else if (sec_ace->type == SEC_ACE_TYPE_ACCESS_DENIED_OBJECT) {
-               access_type = "DEINED OBJECT";
+               access_type = "DENIED OBJECT";
        } else if (sec_ace->type == SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT) {
                access_type = "AUDIT OBJECT";
        }
@@ -136,7 +121,7 @@ void ads_disp_ace(SEC_ACE *sec_ace)
 }
 
 /* display ACL */
-void ads_disp_acl(SEC_ACL *sec_acl, char *type)
+static void ads_disp_acl(SEC_ACL *sec_acl, const char *type)
 {
         if (!sec_acl)
                printf("------- (%s) ACL not present\n", type);
@@ -171,5 +156,4 @@ void ads_disp_sd(SEC_DESC *sd)
        printf("-------------- End Of Security Descriptor\n");
 }
 
-#endif