--- samba/source/utils/smbcacls.c.orig	2005-05-18 17:59:26.000000000 -0700
+++ samba/source/utils/smbcacls.c	2005-05-18 17:59:30.000000000 -0700
@@ -635,6 +635,8 @@
 				printf(" not found\n");
 			}
 		}
+		old->owner_sid = NULL;
+		old->grp_sid = NULL;
 		break;
 
 	case SMB_ACL_MODIFY:
@@ -659,10 +661,14 @@
 
 		if (sd->owner_sid) {
 			old->owner_sid = sd->owner_sid;
+		} else {
+			old->owner_sid = NULL;
 		}
-
+		
 		if (sd->grp_sid) { 
 			old->grp_sid = sd->grp_sid;
+		} else {
+			old->grp_sid = NULL;			
 		}
 
 		break;
@@ -671,6 +677,8 @@
 		for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
 			add_ace(&old->dacl, &sd->dacl->ace[i]);
 		}
+		old->owner_sid = NULL;
+		old->grp_sid = NULL;
 		break;
 
 	case SMB_ACL_SET: