diff options
| author | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
| commit | f3e3a56ea9085b186af24b0b4e911863fd9ceacc (patch) | |
| tree | 994a10565d8ce8ff296fe3153433090e7570b271 /source3/python | |
| parent | 8986bdf7072a9d9f100767a4546c70cdf69a72b2 (diff) | |
| download | samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.gz samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.bz2 samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.zip | |
Merge a bunch of trivial changes from HEAD. The difference remaining
should actual functional differences between HEAD and 3.0.
- Mostly reformatting
- Removal of unecessary #include "smb.h"
- Merge of dyn_DRIVERFILE removal
- Silly bug fix for python code
(This used to be commit d3998307adc50ba50defe610cb656c73799ae3b9)
Diffstat (limited to 'source3/python')
| -rw-r--r-- | source3/python/py_conv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/python/py_conv.c b/source3/python/py_conv.c index 966a892528..e865daf7d9 100644 --- a/source3/python/py_conv.c +++ b/source3/python/py_conv.c @@ -45,7 +45,7 @@ PyObject *from_struct(void *s, struct pyconv *conv) fstring str = ""; if (u->buffer) - fstr_pull(s, u); + fstr_pull(str, u); item = PyString_FromString(str); PyDict_SetItemString(obj, conv[i].name, item); |