libcli/util Bring samba4 unix -> nt_status code in common.

Due to library link orders, this is already the function that is being
used.  However we still need to sort out the duplicate symbol issues,
probably by renaming things.

Andrew Bartlett

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index ab6ca4f94d8fad0d460f90cf0a4fa5d83b5b08e5..acb1ce38f06cc58bd7a8872accf667bc9d3a5a6f 100644 (file)
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_LIBRARY('cliauth',
                   source='',
-                  deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE KRB5_WRAP',
+                  deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE KRB5_WRAP errors',
                   private_library=True,
                   grouping_library=True)
 

diff --git a/source4/libcli/util/errormap.c b/libcli/util/errmap_unix.c
similarity index 100%
rename from source4/libcli/util/errormap.c
rename to libcli/util/errmap_unix.c

diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
index d87f0ba88eb44f01cf333644befb6fc33e458be0..a364d30f035868648ec22d283040145cc1250bd2 100644 (file)
--- a/libcli/util/wscript_build
+++ b/libcli/util/wscript_build
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_ERRORS',
-       source='doserr.c errormap.c nterr.c',
-       public_deps='talloc samba-util-common'
-       )
+bld.SAMBA_LIBRARY('errors',
+                  public_headers='error.h ntstatus.h doserr.h werror.h',
+                  header_path='core',
+                  source='doserr.c errormap.c nterr.c errmap_unix.c',
+                  public_deps='talloc samba-util-common',
+                  private_library=True
+                  )
 

diff --git a/source3/wscript_build b/source3/wscript_build
index 99e8d95a326be7ef8391211ba65d1218d47c2000..e3160e691354082eaaa7134e81f79617653f1557 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1066,7 +1066,7 @@ bld.SAMBA3_SUBSYSTEM('ldb3',
 
 bld.SAMBA3_SUBSYSTEM('errors3',
                      source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
-                     deps='LIBCLI_ERRORS')
+                     deps='errors')
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
@@ -1412,7 +1412,6 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
 if not bld.env.toplevel_build:
     bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
-    bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
     bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG')
     bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
     bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')

diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 586366d4226cf8aee88045d4ecd39aec559a332e..90e8560573f5d5bc3ae6e5c96505557ee0e5c1a8 100644 (file)
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('authkrb5',
                   source='kerberos.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
                   autoproto='proto.h',
                   public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1',
-                  deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP',
+                  deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb KRB5_WRAP errors',
                   private_library=True
                   )
 

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 9d56e4f150761887e78468a0bc8b37717ffc0328..fe00059c4b574ba0c3d24e95c3694d8141d9454a 100644 (file)
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samdb',
        autoproto='samdb/samdb_proto.h',
        public_deps='krb5',
        vnum='0.0.1',
-       deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap',
+       deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap errors',
        )
 
 

diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index a8d4df2ce0f29a1396926cd6631e305a1fedd776..e6a13f39336e60a37997930d7ad1ac1a0b1ea1ea 100644 (file)
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba',
                   source='ldif_handlers.c',
                   autoproto='ldif_handlers_proto.h',
                   public_deps='ldb',
-                  deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util',
+                  deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util errors',
                   private_library=True
                   )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 02bb3b8d36531a20028d2ca3038c567df0c09d1c..1799bcabadc107d2ac3e359c9b5d5340fda57081 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -3,15 +3,6 @@
 bld.RECURSE('ldap')
 bld.RECURSE('wbclient')
 
-bld.SAMBA_LIBRARY('errors',
-                  source='util/errormap.c',
-                  public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
-                  header_path='core',
-                  deps='talloc LIBCLI_ERRORS',
-                  private_library=True
-                  )
-
-
 bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
        source='../../libcli/util/tstream.c',
        public_deps='LIBTSOCKET UTIL_TEVENT'