Upgrading to GitLab 12.5.4.

Commit 14ebdf43 authored by idd-guest's avatar idd-guest

Load samba-3.6.14 into branches/samba/upstream.

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@4222 fc4039ab-9d04-0410-8cac-899223bdd6b0
parent d2173700
==============================
Release Notes for Samba 3.6.14
April 29, 2013
==============================
This is is the latest stable release of Samba 3.6.
Major enhancements in Samba 3.6.14 include:
o Certain xattrs cause Windows error 0x800700FF (bug #9130).
Changes since 3.6.13:
---------------------
o Jeremy Allison <jra@samba.org>
* BUG 9130: Certain xattrs cause Windows error 0x800700FF.
* BUG 9724: Use is_encrypted_packet() function correctly inside server.
* BUG 9733: Fix 'smbcontrol close-share' is not working.
* BUG 9747: Make sure that we only propogate the INHERITED flag when we are
allowed to.
* BUG 9748: Remove unneeded fstat system call from hot read path.
* BUG 9811: Fix bug in old create temp SMB request. Only use VFS functions.
o David Disseldorp <ddiss@samba.org>
* BUG 9650: New or deleted CUPS printerqueues are not recognized by Samba.
* BUG 9807: wbinfo: Fix segfault in wbinfo_pam_logon.
o Volker Lendecke <vl@samba.org>
* BUG 9727: wkssvc: Fix NULL pointer dereference.
* BUG 9736: smbd: Tune "dir" a bit.
* BUG 9775: Fix segfault for "artificial" conn_structs.
* BUG 9809: RHEL SPEC: Package dbwrap_tool man page.
o Andreas Schneider <asn@samba.org>
* BUG 9139: Fix the username map optimization.
* BUG 9699: Fix adding case sensitive spn.
* BUG 9723: Add a tool to migrate latin1 printing tdbs to registry.
* BUG 9735: Fix Winbind separator in upn to username conversion.
* BUG 9766: Cache name_to_sid/sid_to_name correctly.
Note about upgrading from older versions:
-----------------------------------------
It is still the case that there are printing tdbs (ntprinting.tdb, ntforms.tdb,
ntdrivers.tdb) which are in latin1 or other encodings. When updating from
Samba 3.5 or earlier to Samba 3.6 or 4.0 these tdbs need to be migrated to our
new registry based printing management. This means during the migration we
also need to do charset conversion. This can only been done manually cause we don't
know in which encoding the tdb is. You have to specify the correct code page
for the conversion, see iconv -l and Wikipedia [1] for the available codepages.
The mostly used one is Windows Latin1 which is CP1252.
We've extended the 'net printing dump' and 'net printing migrate' commands to
define the encoding of the tdb. So you can correctly view the tdb with:
net printing dump encoding=CP1252 /path/to/ntprinters.tdb
or migrate it with e.g.:
net printing migrate encoding=CP1252 /path/to/ntprinters.tdb
If you migrate printers we suggest you do it in the following order.
ntforms.tdb
ntdrivers.tdb
ntprinting.tdb
Don't forget to rename, move or delete these files in /var/lib/samba after the
migration.
[1] https://en.wikipedia.org/wiki/Code_page
######################################################################
Reporting bugs & Development Discussion
#######################################
Please discuss this release on the samba-technical mailing list or by
joining the #samba-technical IRC channel on irc.freenode.net.
If you do report problems then please try to send high quality
feedback. If you don't provide vital information to help us track down
the problem then you will probably be ignored. All bug reports should
be filed under the Samba 3.6 product in the project's Bugzilla
database (https://bugzilla.samba.org/).
======================================================================
== Our Code, Our Bugs, Our Responsibility.
== The Samba Team
======================================================================
Release notes for older releases follow:
----------------------------------------
==============================
Release Notes for Samba 3.6.13
March 18, 2013
......@@ -94,8 +194,9 @@ database (https://bugzilla.samba.org/).
== The Samba Team
======================================================================
Release notes for older releases follow:
----------------------------------------
----------------------------------------------------------------------
==============================
Release Notes for Samba 3.6.12
......
......@@ -30,20 +30,24 @@ interface ntprinting
[in] ntprinting_form form
);
/* Samba 3 tdb storage format: drivers
/*
* First the string flags and then the Samba 3 tdb storage
* format: drivers
* "dffffffff" followed by a remaining buffer of "f" array */
typedef [flag(NDR_NOALIGN),public] struct {
[skip] uint32 string_flags;
uint32 version;
utf8string name;
utf8string environment;
utf8string driverpath;
utf8string datafile;
utf8string configfile;
utf8string helpfile;
utf8string monitorname;
utf8string defaultdatatype;
[flag(STR_UTF8|STR_NOTERM|NDR_REMAINING)] string_array dependent_files;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string name;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string environment;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string driverpath;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string datafile;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string configfile;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string helpfile;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string monitorname;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string defaultdatatype;
[flag((ndr_ntprinting_string_flags(r->string_flags)&~STR_NULLTERM)|STR_NOTERM|NDR_REMAINING)] string_array dependent_files;
} ntprinting_driver;
[public] void decode_ntprinting_driver(
......@@ -57,9 +61,11 @@ interface ntprinting
* "B" private data blob */
typedef [flag(NDR_NOALIGN),public] struct {
[skip] uint32 string_flags;
/* uint32 devicemode_ptr; */
utf8string devicename;
utf8string formname;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string devicename;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string formname;
uint16 specversion;
uint16 driverversion;
uint16 size;
......@@ -95,21 +101,30 @@ interface ntprinting
DATA_BLOB *nt_dev_private;
} ntprinting_devicemode;
/* Samba 3 tdb storage format: printer_data
/*
* First the string flags and then the Samba 3 tdb storage
* format: printer_data
* "p" ptr to printer_data
* "fdB" */
typedef [flag(NDR_NOALIGN),public] struct {
[skip] uint32 string_flags;
uint32 ptr;
utf8string name;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string name;
uint32 type;
DATA_BLOB data;
} ntprinting_printer_data;
/* Samba 3 tdb storage format: printer_info
* "dddddddddddfffffPfffff" */
/*
* First the string flags and then the Samba 3 tdb storage
* format: printer_info
* "dddddddddddfffffPfffff"
*/
typedef [flag(NDR_NOALIGN),public] struct {
[skip] uint32 string_flags;
uint32 attributes;
uint32 priority;
uint32 default_priority;
......@@ -121,17 +136,17 @@ interface ntprinting
uint32 changeid;
uint32 c_setprinter;
uint32 setuptime;
utf8string servername;
utf8string printername;
utf8string sharename;
utf8string portname;
utf8string drivername;
utf8string comment;
utf8string location;
utf8string sepfile;
utf8string printprocessor;
utf8string datatype;
utf8string parameters;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string servername;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string printername;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string sharename;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string portname;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string drivername;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string comment;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string location;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string sepfile;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string printprocessor;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string datatype;
[flag(ndr_ntprinting_string_flags(r->string_flags))] string parameters;
} ntprinting_printer_info;
/* Abstract Samba 3 printer
......
......@@ -22,6 +22,19 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_ntprinting.h"
_PUBLIC_ uint32_t ndr_ntprinting_string_flags(uint32_t string_flags)
{
uint32_t flags = LIBNDR_FLAG_STR_NULLTERM;
if (string_flags & LIBNDR_FLAG_STR_ASCII) {
flags |= LIBNDR_FLAG_STR_ASCII;
} else {
flags |= LIBNDR_FLAG_STR_UTF8;
}
return flags;
}
_PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int ndr_flags, struct ntprinting_printer *r)
{
uint32_t _ptr_devmode;
......@@ -43,6 +56,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int
if (r->devmode) {
_mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
r->devmode->string_flags = r->info.string_flags;
NDR_CHECK(ndr_pull_ntprinting_devicemode(ndr, NDR_SCALARS|NDR_BUFFERS, r->devmode));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
}
......@@ -59,6 +73,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int
}
r->printer_data = talloc_realloc(ndr, r->printer_data, struct ntprinting_printer_data, r->count + 1);
NDR_ERR_HAVE_NO_MEMORY(r->printer_data);
r->printer_data[r->count].string_flags = r->info.string_flags;
NDR_CHECK(ndr_pull_ntprinting_printer_data(ndr, NDR_SCALARS, &r->printer_data[r->count]));
r->count++;
}
......
......@@ -22,4 +22,6 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_ntprinting.h"
_PUBLIC_ uint32_t ndr_ntprinting_string_flags(uint32_t string_flags);
_PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int ndr_flags, struct ntprinting_printer *r);
......@@ -2448,7 +2448,7 @@ static char* winbind_upn_to_username(struct pwb_context *ctx,
return NULL;
}
return talloc_asprintf(ctx, "%s\\%s", domain, name);
return talloc_asprintf(ctx, "%s%c%s", domain, sep, name);
}
static int _pam_delete_cred(pam_handle_t *pamh, int flags,
......
......@@ -1728,7 +1728,7 @@ static bool wbinfo_pam_logon(char *username)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcLogonUserParams params;
struct wbcAuthErrorInfo *error;
struct wbcAuthErrorInfo *error = NULL;
char *s = NULL;
char *p = NULL;
TALLOC_CTX *frame = talloc_tos();
......@@ -1779,16 +1779,15 @@ static bool wbinfo_pam_logon(char *username)
d_printf("plaintext password authentication %s\n",
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
if (!WBC_ERROR_IS_OK(wbc_status)) {
if (!WBC_ERROR_IS_OK(wbc_status) && (error != NULL)) {
d_fprintf(stderr,
"error code was %s (0x%x)\nerror message was: %s\n",
error->nt_string,
(int)error->nt_status,
error->display_string);
wbcFreeMemory(error);
return false;
}
return true;
return WBC_ERROR_IS_OK(wbc_status);
}
/* Save creds with winbind */
......
......@@ -5,7 +5,7 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba@samba.org>
Name: samba
Version: 3.6.13
Version: 3.6.14
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
......
......@@ -20,7 +20,7 @@ SRCDIR=`rpm --eval %_sourcedir`
USERID=`id -u`
GRPID=`id -g`
VERSION='3.6.13'
VERSION='3.6.14'
REVISION=''
SPECFILE="samba.spec"
RPMVER=`rpm --version | awk '{print $3}'`
......
......@@ -11,7 +11,7 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba@samba.org>
Name: samba
Version: 3.6.13
Version: 3.6.14
Release: 1
Epoch: 0
License: GNU GPL version 3
......@@ -370,6 +370,7 @@ fi
%{_mandir}/man8/winbindd.8*
%{_mandir}/man1/ntlm_auth.1*
%{_mandir}/man1/wbinfo.1*
%{_mandir}/man1/dbwrap_*.1*
%{_mandir}/man8/vfs_*.8*
%{_mandir}/man8/idmap_*.8*
......
......@@ -370,6 +370,7 @@ fi
%{_mandir}/man8/winbindd.8*
%{_mandir}/man1/ntlm_auth.1*
%{_mandir}/man1/wbinfo.1*
%{_mandir}/man1/dbwrap_*.1*
%{_mandir}/man8/vfs_*.8*
%{_mandir}/man8/idmap_*.8*
......
......@@ -1070,6 +1070,7 @@ my %property_list = (
"noprint" => ["FUNCTION", "TYPEDEF", "STRUCT", "UNION", "ENUM", "BITMAP", "ELEMENT", "PIPE"],
"nopython" => ["FUNCTION", "TYPEDEF", "STRUCT", "UNION", "ENUM", "BITMAP"],
"todo" => ["FUNCTION"],
"skip" => ["ELEMENT"],
# union
"switch_is" => ["ELEMENT"],
......
......@@ -924,7 +924,11 @@ sub ParseDataPull($$$$$$$)
$var_name = get_pointer_to($var_name);
$self->pidl("NDR_CHECK(".TypeFunctionName("ndr_pull", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
if (has_property($e, "skip")) {
$self->pidl("/* [skip] '$var_name' */");
} else {
$self->pidl("NDR_CHECK(".TypeFunctionName("ndr_pull", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
}
my $pl = GetPrevLevel($e, $l);
......@@ -962,7 +966,11 @@ sub ParseDataPush($$$$$$$)
$var_name = get_pointer_to($var_name);
}
$self->pidl("NDR_CHECK(".TypeFunctionName("ndr_push", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
if (has_property($e, "skip")) {
$self->pidl("/* [skip] '$var_name' */");
} else {
$self->pidl("NDR_CHECK(".TypeFunctionName("ndr_push", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
}
} else {
$self->ParseTypePush($l->{DATA_TYPE}, $ndr, $var_name, $primitives, $deferred);
}
......
......@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=6
SAMBA_VERSION_RELEASE=13
SAMBA_VERSION_RELEASE=14
########################################################
# Bug fix releases use a letter for the patch revision #
......
......@@ -425,12 +425,16 @@ bool map_username(TALLOC_CTX *ctx, const char *user_in, char **p_user_out)
x_fclose(f);
/*
* Setup the last_from and last_to as an optimization so
* If we didn't successfully map a user in the loop above,
* setup the last_from and last_to as an optimization so
* that we don't scan the file again for the same user.
*/
set_last_from_to(user_in, user_in);
store_map_in_gencache(ctx, user_in, user_in);
if (!mapped_user) {
DEBUG(8, ("The user '%s' has no mapping. "
"Skip it next time.\n", user_in));
set_last_from_to(user_in, user_in);
store_map_in_gencache(ctx, user_in, user_in);
}
return mapped_user;
}
/* Autogenerated by script/mkversion.sh */
#define SAMBA_VERSION_MAJOR 3
#define SAMBA_VERSION_MINOR 6
#define SAMBA_VERSION_RELEASE 13
#define SAMBA_VERSION_OFFICIAL_STRING "3.6.13"
#define SAMBA_VERSION_RELEASE 14
#define SAMBA_VERSION_OFFICIAL_STRING "3.6.14"
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
......
......@@ -602,7 +602,8 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
if (!container) {
new_flags = 0;
} else {
new_flags &= ~SEC_ACE_FLAG_INHERIT_ONLY;
new_flags &= ~(SEC_ACE_FLAG_INHERIT_ONLY|
SEC_ACE_FLAG_INHERITED_ACE);
if (!(new_flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) {
new_flags |= SEC_ACE_FLAG_INHERIT_ONLY;
......
......@@ -1920,8 +1920,7 @@ ADS_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_n
ads_msgfree(ads, res);
return ADS_ERROR(LDAP_NO_MEMORY);
}
strupper_m(psp1);
strlower_m(&psp1[strlen(spn)]);
strlower_m(&psp1[strlen(spn) + 1]);
servicePrincipalName[0] = psp1;
DEBUG(5,("ads_add_service_principal_name: INFO: Adding %s to host %s\n",
......@@ -1934,8 +1933,7 @@ ADS_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_n
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto out;
}
strupper_m(psp2);
strlower_m(&psp2[strlen(spn)]);
strlower_m(&psp2[strlen(spn) + 1]);
servicePrincipalName[1] = psp2;
DEBUG(5,("ads_add_service_principal_name: INFO: Adding %s to host %s\n",
......
This diff is collapsed.
......@@ -22,21 +22,23 @@ struct ntprinting_form {
}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
struct ntprinting_driver {
uint32_t string_flags;/* [skip] */
uint32_t version;
const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * environment;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * driverpath;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * datafile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * configfile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * helpfile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * monitorname;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * defaultdatatype;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char ** dependent_files;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */
const char * name;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * environment;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * driverpath;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * datafile;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * configfile;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * helpfile;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * monitorname;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * defaultdatatype;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char ** dependent_files;/* [flag((ndr_ntprinting_string_flags(r->string_flags)&~LIBNDR_FLAG_STR_NULLTERM)|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */
}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
struct ntprinting_devicemode {
const char * devicename;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * formname;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
uint32_t string_flags;/* [skip] */
const char * devicename;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * formname;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
uint16_t specversion;
uint16_t driverversion;
uint16_t size;
......@@ -73,13 +75,15 @@ struct ntprinting_devicemode {
}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
struct ntprinting_printer_data {
uint32_t string_flags;/* [skip] */
uint32_t ptr;
const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * name;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
uint32_t type;
DATA_BLOB data;
}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
struct ntprinting_printer_info {
uint32_t string_flags;/* [skip] */
uint32_t attributes;
uint32_t priority;
uint32_t default_priority;
......@@ -91,17 +95,17 @@ struct ntprinting_printer_info {
uint32_t changeid;
uint32_t c_setprinter;
uint32_t setuptime;
const char * servername;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * printername;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * sharename;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * portname;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * drivername;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * comment;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * location;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * sepfile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * printprocessor;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * datatype;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * parameters;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
const char * servername;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * printername;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * sharename;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * portname;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * drivername;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * comment;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * location;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * sepfile;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * printprocessor;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * datatype;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
const char * parameters;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
struct ntprinting_printer {
......
......@@ -4824,8 +4824,8 @@ void initdfs(void)
PyModule_AddObject(m, "DFS_MANAGER_VERSION_W2K8", PyInt_FromLong(DFS_MANAGER_VERSION_W2K8));
PyModule_AddObject(m, "DFS_INVALID_PRIORITY_CLASS", PyInt_FromLong(DFS_INVALID_PRIORITY_CLASS));
PyModule_AddObject(m, "DFS_VOLUME_STATE_AD_BLOB", PyInt_FromLong(DFS_VOLUME_STATE_AD_BLOB));
PyModule_AddObject(m, "DFS_STORAGE_STATES", PyInt_FromLong(0xf));
PyModule_AddObject(m, "DFS_PROPERTY_FLAG_TARGET_FAILBACK", PyInt_FromLong(DFS_PROPERTY_FLAG_TARGET_FAILBACK));
PyModule_AddObject(m, "DFS_STORAGE_STATES", PyInt_FromLong(0xf));
PyModule_AddObject(m, "DFS_VOLUME_STATE_ONLINE", PyInt_FromLong(DFS_VOLUME_STATE_ONLINE));
PyModule_AddObject(m, "DFS_GLOBAL_LOW_PRIORITY_CLASS", PyInt_FromLong(DFS_GLOBAL_LOW_PRIORITY_CLASS));
PyModule_AddObject(m, "DFS_MANAGER_VERSION_W2K", PyInt_FromLong(DFS_MANAGER_VERSION_W2K));
......
......@@ -1489,8 +1489,8 @@ void initdns(void)
PyModule_AddObject(m, "DNS_RCODE_NXRRSET", PyInt_FromLong(DNS_RCODE_NXRRSET));
PyModule_AddObject(m, "DNS_QTYPE_A", PyInt_FromLong(DNS_QTYPE_A));
PyModule_AddObject(m, "DNS_QTYPE_NSEC", PyInt_FromLong(DNS_QTYPE_NSEC));
PyModule_AddObject(m, "DNS_QTYPE_SRV", PyInt_FromLong(DNS_QTYPE_SRV));
PyModule_AddObject(m, "DNS_QTYPE_DS", PyInt_FromLong(DNS_QTYPE_DS));
PyModule_AddObject(m, "DNS_QTYPE_SRV", PyInt_FromLong(DNS_QTYPE_SRV));
PyModule_AddObject(m, "DNS_RCODE_REFUSED", PyInt_FromLong(DNS_RCODE_REFUSED));
PyModule_AddObject(m, "DNS_RCODE_NOTZONE", PyInt_FromLong(DNS_RCODE_NOTZONE));
PyModule_AddObject(m, "DNS_QTYPE_MX", PyInt_FromLong(DNS_QTYPE_MX));
......
......@@ -1138,8 +1138,8 @@ void initdnsp(void)
PyModule_AddObject(m, "DNS_RANK_ROOT_HINT", PyInt_FromLong(DNS_RANK_ROOT_HINT));
PyModule_AddObject(m, "DNS_TYPE_RRSIG", PyInt_FromLong(DNS_TYPE_RRSIG));
PyModule_AddObject(m, "DNS_TYPE_ALL", PyInt_FromLong(DNS_TYPE_ALL));
PyModule_AddObject(m, "DNS_TYPE_TXT", PyInt_FromLong(DNS_TYPE_TXT));
PyModule_AddObject(m, "DNS_TYPE_A", PyInt_FromLong(DNS_TYPE_A));
PyModule_AddObject(m, "DNS_TYPE_TXT", PyInt_FromLong(DNS_TYPE_TXT));
PyModule_AddObject(m, "DNS_TYPE_AFSDB", PyInt_FromLong(DNS_TYPE_AFSDB));
PyModule_AddObject(m, "DNS_RANK_NS_GLUE", PyInt_FromLong(DNS_RANK_NS_GLUE));
PyModule_AddObject(m, "DNS_RANK_CACHE_NA_AUTHORITY", PyInt_FromLong(DNS_RANK_CACHE_NA_AUTHORITY));
......
......@@ -2102,8 +2102,8 @@ void initfrstrans(void)
PyModule_AddObject(m, "FRSTRANS_RDC_VERSION", PyInt_FromLong(FRSTRANS_RDC_VERSION));
PyModule_AddObject(m, "FRSTRANS_RDC_FILTER_GENERIC", PyInt_FromLong(FRSTRANS_RDC_FILTER_GENERIC));
PyModule_AddObject(m, "FRSTRANS_VERSION_REQUEST_SLOW_SYNC", PyInt_FromLong(FRSTRANS_VERSION_REQUEST_SLOW_SYNC));
PyModule_AddObject(m, "FRSTRANS_TRANSPORT_SUPPORTS_RDC_SIMILARITY", PyInt_FromLong(FRSTRANS_TRANSPORT_SUPPORTS_RDC_SIMILARITY));
PyModule_AddObject(m, "FRSTRANS_RDC_FILTER_MAX", PyInt_FromLong(FRSTRANS_RDC_FILTER_MAX));
PyModule_AddObject(m, "FRSTRANS_TRANSPORT_SUPPORTS_RDC_SIMILARITY", PyInt_FromLong(FRSTRANS_TRANSPORT_SUPPORTS_RDC_SIMILARITY));
Py_INCREF((PyObject *)(void *)&frstrans_VersionVector_Type);
PyModule_AddObject(m, "VersionVector", (PyObject *)(void *)&frstrans_VersionVector_Type);
Py_INCREF((PyObject *)(void *)&frstrans_Update_Type);
......
......@@ -324,11 +324,11 @@ void initidmap(void)
PyModule_AddObject(m, "ID_TYPE_BOTH", PyInt_FromLong(ID_TYPE_BOTH));
PyModule_AddObject(m, "ID_MAPPED", PyInt_FromLong(ID_MAPPED));
PyModule_AddObject(m, "ID_TYPE_UID", PyInt_FromLong(ID_TYPE_UID));
PyModule_AddObject(m, "ID_TYPE_NOT_SPECIFIED", PyInt_FromLong(ID_TYPE_NOT_SPECIFIED));
PyModule_AddObject(m, "ID_EXPIRED", PyInt_FromLong(ID_EXPIRED));
PyModule_AddObject(m, "ID_UNKNOWN", PyInt_FromLong(ID_UNKNOWN));
PyModule_AddObject(m, "ID_TYPE_GID", PyInt_FromLong(ID_TYPE_GID));
PyModule_AddObject(m, "ID_UNMAPPED", PyInt_FromLong(ID_UNMAPPED));
PyModule_AddObject(m, "ID_TYPE_NOT_SPECIFIED", PyInt_FromLong(ID_TYPE_NOT_SPECIFIED));
PyModule_AddObject(m, "ID_TYPE_GID", PyInt_FromLong(ID_TYPE_GID));
PyModule_AddObject(m, "ID_UNKNOWN", PyInt_FromLong(ID_UNKNOWN));
Py_INCREF((PyObject *)(void *)&unixid_Type);
PyModule_AddObject(m, "unixid", (PyObject *)(void *)&unixid_Type);
Py_INCREF((PyObject *)(void *)&id_map_Type);
......
......@@ -702,8 +702,8 @@ void initmisc(void)
PyModule_AddObject(m, "REG_QWORD", PyInt_FromLong(REG_QWORD));
PyModule_AddObject(m, "SEC_CHAN_RODC", PyInt_FromLong(SEC_CHAN_RODC));
PyModule_AddObject(m, "REG_LINK", PyInt_FromLong(REG_LINK));
PyModule_AddObject(m, "REG_NONE", PyInt_FromLong(REG_NONE));
PyModule_AddObject(m, "SEC_CHAN_LOCAL", PyInt_FromLong(SEC_CHAN_LOCAL));
PyModule_AddObject(m, "REG_NONE", PyInt_FromLong(REG_NONE));
Py_INCREF((PyObject *)(void *)&GUID_Type);
PyModule_AddObject(m, "GUID", (PyObject *)(void *)&GUID_Type);
Py_INCREF((PyObject *)(void *)&ndr_syntax_id_Type);
......
......@@ -227,6 +227,22 @@ static PyTypeObject ntprinting_form_Type = {
};
static PyObject *py_ntprinting_driver_get_string_flags(PyObject *obj, void *closure)
{
struct ntprinting_driver *object = (struct ntprinting_driver *)py_talloc_get_ptr(obj);
PyObject *py_string_flags;
py_string_flags = PyInt_FromLong(object->string_flags);
return py_string_flags;
}
static int py_ntprinting_driver_set_string_flags(PyObject *py_obj, PyObject *value, void *closure)
{
struct ntprinting_driver *object = (struct ntprinting_driver *)py_talloc_get_ptr(py_obj);
PY_CHECK_TYPE(&PyInt_Type, value, return -1;);
object->string_flags = PyInt_AsLong(value);
return 0;
}
static PyObject *py_ntprinting_driver_get_version(PyObject *obj, void *closure)
{
struct ntprinting_driver *object = (struct ntprinting_driver *)py_talloc_get_ptr(obj);
......@@ -379,6 +395,7 @@ static int py_ntprinting_driver_set_dependent_files(PyObject *py_obj, PyObject *
}
static PyGetSetDef py_ntprinting_driver_getsetters[] = {
{ discard_const_p(char, "string_flags"), py_ntprinting_driver_get_string_flags, py_ntprinting_driver_set_string_flags },
{ discard_const_p(char, "version"), py_ntprinting_driver_get_version, py_ntprinting_driver_set_version },
{ discard_const_p(char, "name"), py_ntprinting_driver_get_name, py_ntprinting_driver_set_name },
{ discard_const_p(char, "environment"), py_ntprinting_driver_get_environment, py_ntprinting_driver_set_environment },
......@@ -460,6 +477,22 @@ static PyTypeObject ntprinting_driver_Type = {
};
static PyObject *py_ntprinting_devicemode_get_string_flags(PyObject *obj, void *closure)
{
struct ntprinting_devicemode *object = (struct ntprinting_devicemode *)py_talloc_get_ptr(obj);
PyObject *py_string_flags;
py_string_flags = PyInt_FromLong(object->string_flags);
return py_string_flags;
}
static int py_ntprinting_devicemode_set_string_flags(PyObject *py_obj, PyObject *value, void *closure)
{
struct ntprinting_devicemode *object = (struct ntprinting_devicemode *)py_talloc_get_ptr(py_obj);
PY_CHECK_TYPE(&PyInt_Type, value, return -1;);
object->string_flags = PyInt_AsLong(value);
return 0;
}
static PyObject *py_ntprinting_devicemode_get_devicename(PyObject *obj, void *closure)
{
struct ntprinting_devicemode *object = (struct ntprinting_devicemode *)py_talloc_get_ptr(obj);
......@@ -1029,6 +1062,7 @@ static int py_ntprinting_devicemode_set_nt_dev_private(PyObject *py_obj, PyObjec
}
static PyGetSetDef py_ntprinting_devicemode_getsetters[] = {
{ discard_const_p(char, "string_flags"), py_ntprinting_devicemode_get_string_flags, py_ntprinting_devicemode_set_string_flags },
{ discard_const_p(char, "devicename"), py_ntprinting_devicemode_get_devicename, py_ntprinting_devicemode_set_devicename },
{ discard_const_p(char, "formname"), py_ntprinting_devicemode_get_formname, py_ntprinting_devicemode_set_formname },
{ discard_const_p(char, "specversion"), py_ntprinting_devicemode_get_specversion, py_ntprinting_devicemode_set_specversion },
......@@ -1135,6 +1169,22 @@ static PyTypeObject ntprinting_devicemode_Type = {
};
static PyObject *py_ntprinting_printer_data_get_string_flags(PyObject *obj, void *closure)
{
struct ntprinting_printer_data *object = (struct ntprinting_printer_data *)py_talloc_get_ptr(obj);
PyObject *py_string_flags;
py_string_flags = PyInt_FromLong(object->string_flags);
return py_string_flags;
}
static int py_ntprinting_printer_data_set_string_flags(PyObject *py_obj, PyObject *value, void *closure)
{
struct ntprinting_printer_data *object = (struct ntprinting_printer_data *)py_talloc_get_ptr(py_obj);
PY_CHECK_TYPE(&PyInt_Type, value, return -1;);
object->string_flags = PyInt_AsLong(value);
return 0;
}
static PyObject *py_ntprinting_printer_data_get_ptr(PyObject *obj, void *closure)
{
struct ntprinting_printer_data *object = (struct ntprinting_printer_data *)py_talloc_get_ptr(obj);
......@@ -1198,6 +1248,7 @@ static int py_ntprinting_printer_data_set_data(PyObject *py_obj, PyObject *value
}