--- source3/utils/net_sam.bak Wed Sep 26 15:28:31 2012 +++ source3/utils/net_sam.c Wed Sep 26 16:09:48 2012 @@ -746,10 +746,18 @@ return -1; } + dom = NULL; + if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL, &dom, &name, &sid, &type)) { - d_fprintf(stderr, _("Could not find name %s\n"), argv[0]); - return -1; + + /* try it as a SID */ + if ( !string_to_sid( &sid, argv[0] ) ) { + d_fprintf(stderr, _("Could not find name %s\n"), + argv[0]); + return -1; + } + } for (i=1; i < argc; i++) { @@ -764,7 +772,12 @@ return -1; } - d_printf(_("Revoked %s from %s\\%s\n"), argv[i], dom, name); + if (dom == NULL) { + d_printf(_("Revoked %s from %s\n"), argv[i], argv[0]); + } else { + d_printf(_("Revoked %s from %s\\%s\n"), argv[i], dom, name); + } + } return 0;