From f3e3a56ea9085b186af24b0b4e911863fd9ceacc Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 29 Nov 2002 02:58:59 +0000
Subject: 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)
---
 source3/python/py_conv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/python')

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);
-- 
cgit