s3-lib: Do not set an empty string in split_domain_user()

[samba.git] / source3 / libnet / libnet_samsync_display.c

diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c
index eb891cfc1afc3ff1536edb3dba42009e3a772d3e..034a23fe227e340e7cbb1eba998bc59ef65a899f 100644 (file)
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "libnet/libnet_samsync.h"
+#include "passdb.h"
 
 static void display_group_mem_info(uint32_t rid,
                                   struct netr_DELTA_GROUP_MEMBER *r)
@@ -97,7 +98,7 @@ static void display_domain_info(struct netr_DELTA_DOMAIN *r)
                        nt_errstr(status));
        }
 
-       u_logout = uint64s_nt_time_to_unix_abs((const uint64 *)&r->force_logoff_time);
+       u_logout = uint64s_nt_time_to_unix_abs((const uint64_t *)&r->force_logoff_time);
 
        d_printf("Domain name: %s\n", r->domain_name.string);
 
@@ -206,29 +207,32 @@ static NTSTATUS display_sam_entry(TALLOC_CTX *mem_ctx,
                display_alias_mem(id.rid, u.alias_member);
                break;
        case NETR_DELTA_POLICY:
-               printf("Policy\n");
+               printf("Policy: %s\n",
+                       sid_string_dbg(id.sid));
                break;
        case NETR_DELTA_TRUSTED_DOMAIN:
                printf("Trusted Domain: %s\n",
                        u.trusted_domain->domain_name.string);
                break;
        case NETR_DELTA_DELETE_TRUST:
-               printf("Delete Trust: %d\n",
-                       u.delete_trust.unknown);
+               printf("Delete Trust: %s\n",
+                       sid_string_dbg(id.sid));
                break;
        case NETR_DELTA_ACCOUNT:
-               printf("Account\n");
+               printf("Account: %s\n",
+                       sid_string_dbg(id.sid));
                break;
        case NETR_DELTA_DELETE_ACCOUNT:
-               printf("Delete Account: %d\n",
-                       u.delete_account.unknown);
+               printf("Delete Account: %s\n",
+                       sid_string_dbg(id.sid));
                break;
        case NETR_DELTA_SECRET:
-               printf("Secret\n");
+               printf("Secret: %s\n",
+                       id.name);
                break;
        case NETR_DELTA_DELETE_SECRET:
-               printf("Delete Secret: %d\n",
-                       u.delete_secret.unknown);
+               printf("Delete Secret: %s\n",
+                       id.name);
                break;
        case NETR_DELTA_DELETE_GROUP2:
                printf("Delete Group2: %s\n",