X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fscript%2Fmkproto.awk;h=45cc0821aa8c083f275eb2e30be151b027e02644;hb=46e5effea948931509283cb84b27007d34b521c8;hp=196715d6b196b0617b5b37bc50200813a556a488;hpb=64c53e819b53035ff07f9fa00ca4daef18138f51;p=samba.git

diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk
index 196715d6b19..45cc0821aa8 100644
--- a/source3/script/mkproto.awk
+++ b/source3/script/mkproto.awk
@@ -41,20 +41,6 @@ END {
   }
 }
 
-# special handling for code merge of TNG to head
-/^#define OLD_NTDOMAIN 1/ {
-  printf "#if OLD_NTDOMAIN\n"
-}
-/^#undef OLD_NTDOMAIN/ {
-  printf "#endif\n"
-}
-/^#define NEW_NTDOMAIN 1/ {
-  printf "#if NEW_NTDOMAIN\n"
-}
-/^#undef NEW_NTDOMAIN/ {
-  printf "#endif\n"
-}
-
 # we handle the loadparm.c fns separately
 
 /^FN_LOCAL_BOOL/ {
@@ -64,7 +50,7 @@ END {
 
 /^FN_LOCAL_LIST/ {
   split($0,a,"[,()]")
-  printf "char **%s(int );\n", a[2]
+  printf "const char **%s(int );\n", a[2]
 }
 
 /^FN_LOCAL_STRING/ {
@@ -94,7 +80,7 @@ END {
 
 /^FN_GLOBAL_LIST/ {
   split($0,a,"[,()]")
-  printf "char **%s(void);\n", a[2]
+  printf "const char **%s(void);\n", a[2]
 }
 
 /^FN_GLOBAL_STRING/ {
@@ -134,15 +120,19 @@ END {
     gotstart = 1;
   }
 
-  if( $0 ~ /^ADS_STRUCT|^ADS_STATUS|^DATA_BLOB|^ASN1_DATA|^TDB_CONTEXT|^TDB_DATA|^smb_ucs2_t|^TALLOC_CTX|^hash_element|^NT_DEVICEMODE|^enum.*\(|^NT_USER_TOKEN|^SAM_ACCOUNT/ ) {
+  if( $0 ~ /^ADS_STRUCT|^ADS_STATUS|^DATA_BLOB|^ASN1_DATA|^TDB_CONTEXT|^TDB_DATA|^smb_ucs2_t|^TALLOC_CTX|^hash_element|^NT_DEVICEMODE|^enum.*\(|^NT_USER_TOKEN|^SAM_ACCOUNT|^NTTIME/ ) {
+    gotstart = 1;
+  }
+
+  if( $0 ~ /^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/ ) {
     gotstart = 1;
   }
 
-  if( $0 ~ /^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT/ ) {
+  if( $0 ~ /^SAM_ACCT_INFO_NODE|^SMB_ACL_T|^ADS_MODLIST|^PyObject|^SORTED_TREE|^REGISTRY_HOOK|^REGISTRY_VALUE|^DEVICEMODE|^PAC_DATA|^NET_USER_INFO_3|^smb_event_id_t/ ) {
     gotstart = 1;
   }
 
-  if( $0 ~ /^SAM_ACCT_INFO_NODE|^SMB_ACL_T|^ADS_MODLIST|^PyObject|^SORTED_TREE|^REGISTRY_HOOK|^REGISTRY_VALUE|^DEVICEMODE/ ) {
+  if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2|^LOGIN_CACHE|^krb5_error_code|^LDAP|^u32|^LUID_ATTR/ ) {
     gotstart = 1;
   }