← Back to branch summary

~lefteris-nikoltsios/+junk/samba-lp1016895

« back to all changes in this revision

Viewing changes to source3/libnet/libnet_samsync_display.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
source3/libnet/libnet_samsync_display.c
24
24
*/
25
25
 
26
26
#include "includes.h"
27
 
#include "libnet/libnet.h"
 
27
#include "libnet/libnet_samsync.h"
 
28
#include "passdb.h"
28
29
 
29
30
static void display_group_mem_info(uint32_t rid,
30
31
                                   struct netr_DELTA_GROUP_MEMBER *r)
206
207
                display_alias_mem(id.rid, u.alias_member);
207
208
                break;
208
209
        case NETR_DELTA_POLICY:
209
 
                printf("Policy\n");
 
210
                printf("Policy: %s\n",
 
211
                        sid_string_dbg(id.sid));
210
212
                break;
211
213
        case NETR_DELTA_TRUSTED_DOMAIN:
212
214
                printf("Trusted Domain: %s\n",
213
215
                        u.trusted_domain->domain_name.string);
214
216
                break;
215
217
        case NETR_DELTA_DELETE_TRUST:
216
 
                printf("Delete Trust: %d\n",
217
 
                        u.delete_trust.unknown);
 
218
                printf("Delete Trust: %s\n",
 
219
                        sid_string_dbg(id.sid));
218
220
                break;
219
221
        case NETR_DELTA_ACCOUNT:
220
 
                printf("Account\n");
 
222
                printf("Account: %s\n",
 
223
                        sid_string_dbg(id.sid));
221
224
                break;
222
225
        case NETR_DELTA_DELETE_ACCOUNT:
223
 
                printf("Delete Account: %d\n",
224
 
                        u.delete_account.unknown);
 
226
                printf("Delete Account: %s\n",
 
227
                        sid_string_dbg(id.sid));
225
228
                break;
226
229
        case NETR_DELTA_SECRET:
227
 
                printf("Secret\n");
 
230
                printf("Secret: %s\n",
 
231
                        id.name);
228
232
                break;
229
233
        case NETR_DELTA_DELETE_SECRET:
230
 
                printf("Delete Secret: %d\n",
231
 
                        u.delete_secret.unknown);
 
234
                printf("Delete Secret: %s\n",
 
235
                        id.name);
232
236
                break;
233
237
        case NETR_DELTA_DELETE_GROUP2:
234
238
                printf("Delete Group2: %s\n",