← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to source3/librpc/gen_ndr/libnet_join.h

  • 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/librpc/gen_ndr/libnet_join.h
1
1
/* header auto-generated by pidl */
2
2
 
 
3
#ifndef _PIDL_HEADER_libnetjoin
 
4
#define _PIDL_HEADER_libnetjoin
 
5
 
3
6
#include <stdint.h>
4
7
 
5
8
#include "libcli/util/ntstatus.h"
6
9
 
7
10
#include "librpc/gen_ndr/wkssvc.h"
8
11
#include "librpc/gen_ndr/security.h"
 
12
#include "librpc/gen_ndr/misc.h"
9
13
#ifndef _HEADER_libnetjoin
10
14
#define _HEADER_libnetjoin
11
15
 
17
21
                const char * domain_name;/* [ref] */
18
22
                const char * account_ou;
19
23
                const char * admin_account;
20
 
                const char * admin_password;
 
24
                const char * admin_password;/* [noprint] */
21
25
                const char * machine_password;
22
26
                uint32_t join_flags;
23
27
                const char * os_version;
25
29
                uint8_t create_upn;
26
30
                const char * upn;
27
31
                uint8_t modify_config;
28
 
                struct ads_struct *ads;/* [ref] */
 
32
                struct ads_struct *ads;/* [unique] */
29
33
                uint8_t debug;
30
34
                uint8_t use_kerberos;
31
35
                enum netr_SchannelType secure_channel_type;
55
59
                const char * domain_name;
56
60
                const char * account_ou;
57
61
                const char * admin_account;
58
 
                const char * admin_password;
 
62
                const char * admin_password;/* [noprint] */
59
63
                const char * machine_password;
60
64
                uint32_t unjoin_flags;
61
65
                uint8_t delete_machine_account;
62
66
                uint8_t modify_config;
63
67
                struct dom_sid *domain_sid;/* [ref] */
64
 
                struct ads_struct *ads;/* [ref] */
 
68
                struct ads_struct *ads;/* [unique] */
65
69
                uint8_t debug;
66
70
                uint8_t use_kerberos;
67
71
                struct messaging_context *msg_ctx;/* [noprint,ref] */
81
85
};
82
86
 
83
87
#endif /* _HEADER_libnetjoin */
 
88
#endif /* _PIDL_HEADER_libnetjoin */