The branch, master has been updated
via a6be082 s3:web/swat: use strtoll() instead of atoi/atol/atoll
via 10752c5 s4:netcmd/gpo.py: we don't need to set autogenerated
attributes
from 593c932 idl: We don't need a context for
FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2 and avoid colision on bop attribute
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a6be0820d09b3f3eabfbb5f4356add303aa8a494
Author: Stefan Metzmacher <[email protected]>
Date: Fri Aug 5 19:48:38 2011 +0200
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
commit 10752c5b5b039f4645412d81a751dbb926361c9e
Author: Stefan Metzmacher <[email protected]>
Date: Wed Aug 3 09:15:11 2011 +0200
s4:netcmd/gpo.py: we don't need to set autogenerated attributes
metze
-----------------------------------------------------------------------
Summary of changes:
source3/web/swat.c | 25 +++++++++++++++-----
source4/scripting/python/samba/netcmd/gpo.py | 32 +++++++++-----------------
2 files changed, 30 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 69d9fec..1ecaa57 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -199,16 +199,29 @@ bool verify_xsrf_token(const char *formname)
const char *pass = cgi_user_pass();
const char *token = cgi_variable_nonull(XSRF_TOKEN);
const char *time_str = cgi_variable_nonull(XSRF_TIME);
+ char *p = NULL;
+ long long xsrf_time_ll = 0;
time_t xsrf_time = 0;
time_t now = time(NULL);
- if (sizeof(time_t) == sizeof(int)) {
- xsrf_time = atoi(time_str);
- } else if (sizeof(time_t) == sizeof(long)) {
- xsrf_time = atol(time_str);
- } else if (sizeof(time_t) == sizeof(long long)) {
- xsrf_time = atoll(time_str);
+ errno = 0;
+ xsrf_time_ll = strtoll(time_str, &p, 10);
+ if (errno != 0) {
+ return false;
+ }
+ if (p == NULL) {
+ return false;
+ }
+ if (PTR_DIFF(p, time_str) > strlen(time_str)) {
+ return false;
+ }
+ if (xsrf_time_ll > _TYPE_MAXIMUM(time_t)) {
+ return false;
+ }
+ if (xsrf_time_ll < _TYPE_MINIMUM(time_t)) {
+ return false;
}
+ xsrf_time = xsrf_time_ll;
if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
return false;
diff --git a/source4/scripting/python/samba/netcmd/gpo.py
b/source4/scripting/python/samba/netcmd/gpo.py
index 94b1c61..07842c2 100644
--- a/source4/scripting/python/samba/netcmd/gpo.py
+++ b/source4/scripting/python/samba/netcmd/gpo.py
@@ -857,17 +857,13 @@ class cmd_create(Command):
m = ldb.Message()
m.dn = ldb.Dn(self.samdb, gpo_dn.get_linearized())
- m['a01'] = ldb.MessageElement("top", ldb.FLAG_MOD_ADD, "objectClass")
- m['a02'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD,
"objectClass")
- m['a03'] = ldb.MessageElement("groupPolicyContainer",
ldb.FLAG_MOD_ADD, "objectClass")
- m['a04'] = ldb.MessageElement(displayname, ldb.FLAG_MOD_ADD,
"displayName")
- m['a05'] = ldb.MessageElement(gpo, ldb.FLAG_MOD_ADD, "name")
- m['a06'] = ldb.MessageElement(gpo, ldb.FLAG_MOD_ADD, "CN")
- m['a07'] = ldb.MessageElement(unc_path, ldb.FLAG_MOD_ADD,
"gPCFileSysPath")
- m['a08'] = ldb.MessageElement("0", ldb.FLAG_MOD_ADD, "flags")
- m['a09'] = ldb.MessageElement("0", ldb.FLAG_MOD_ADD, "versionNumber")
- m['a10'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD,
"showInAdvancedViewOnly")
- m['a11'] = ldb.MessageElement("2", ldb.FLAG_MOD_ADD,
"gpcFunctionalityVersion")
+ m['a01'] = ldb.MessageElement("groupPolicyContainer",
ldb.FLAG_MOD_ADD, "objectClass")
+ m['a02'] = ldb.MessageElement(displayname, ldb.FLAG_MOD_ADD,
"displayName")
+ m['a03'] = ldb.MessageElement(unc_path, ldb.FLAG_MOD_ADD,
"gPCFileSysPath")
+ m['a04'] = ldb.MessageElement("0", ldb.FLAG_MOD_ADD, "flags")
+ m['a05'] = ldb.MessageElement("0", ldb.FLAG_MOD_ADD, "versionNumber")
+ m['a06'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD,
"showInAdvancedViewOnly")
+ m['a07'] = ldb.MessageElement("2", ldb.FLAG_MOD_ADD,
"gpcFunctionalityVersion")
try:
self.samdb.add(m)
except Exception, e:
@@ -879,11 +875,8 @@ class cmd_create(Command):
m = ldb.Message()
m.dn = ldb.Dn(self.samdb, child_dn.get_linearized())
- m['a01'] = ldb.MessageElement("top", ldb.FLAG_MOD_ADD, "objectClass")
- m['a02'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD,
"objectClass")
- m['a03'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD,
"showInAdvancedViewOnly")
- m['a04'] = ldb.MessageElement("User", ldb.FLAG_MOD_ADD, "CN")
- m['a05'] = ldb.MessageElement("User", ldb.FLAG_MOD_ADD, "name")
+ m['a01'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD,
"objectClass")
+ m['a02'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD,
"showInAdvancedViewOnly")
try:
self.samdb.add(m)
except Exception, e:
@@ -895,11 +888,8 @@ class cmd_create(Command):
m = ldb.Message()
m.dn = ldb.Dn(self.samdb, child_dn.get_linearized())
- m['a01'] = ldb.MessageElement("top", ldb.FLAG_MOD_ADD, "objectClass")
- m['a02'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD,
"objectClass")
- m['a03'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD,
"showInAdvancedViewOnly")
- m['a04'] = ldb.MessageElement("Machine", ldb.FLAG_MOD_ADD, "CN")
- m['a05'] = ldb.MessageElement("Machine", ldb.FLAG_MOD_ADD, "name")
+ m['a01'] = ldb.MessageElement("container", ldb.FLAG_MOD_ADD,
"objectClass")
+ m['a02'] = ldb.MessageElement("TRUE", ldb.FLAG_MOD_ADD,
"showInAdvancedViewOnly")
try:
self.samdb.add(m)
except Exception, e:
--
Samba Shared Repository
