1
0
mirror of https://github.com/samba-team/samba.git synced 2025-05-01 22:50:23 +03:00

8 Commits

Author SHA1 Message Date
Andrew Bartlett
c642680e5b r17548: It is a good idea to commit the fix (from mkhl) before the test that
shows the need for...

Martin Kuhl writes:

The ejs function `substitute_var' returns `undefined' when the first
argument ends in a pattern that should be substituted.

For that reason, the second assertion fails in the following test-case:

,----
| libinclude("base.js");
|
| var obj = new Object();
| obj.FOO = "foo";
| obj.BAR = "bar";
| var str1 = "${FOO}:${BAR}";
| var str2 = "${FOO}:${BAR} "; // note the space after the brace
| var sub1 = substitute_var(str1, obj);
| var sub2 = substitute_var(str2, obj);
|
| assert(str1 + " " == str2);
| assert(sub1 + " " == sub2);
`----

The problem is that the function `split' returns a single-element
array in both cases:
a) the string to split doesn't contain the split pattern
b) the string ends with the split pattern

To work around this, the following patch tests this condition and
returns `undefined' only if the string to split (`list[i]') really
didn't contain a closing brace.
(This used to be commit 8a6908200b1e459bc9067a9d1f9635185a7eee16)
2007-10-10 14:15:37 -05:00
Andrew Tridgell
318ac84440 r11500: fixed a bug in the variable substition code using the new limit argument to split()
(This used to be commit 25131efea8c1a2b0bfa7f999766ebcbab8fa8006)
2007-10-10 13:45:45 -05:00
Andrew Tridgell
620301858a r8638: continue the trend of maknig our C functions true ejs objects by making the string functions
into an object. To keep existing code working I have added:

  string_init(global);

into base.js. That brings the functions into the global scope for our
existing scripts
(This used to be commit a978484738168b82441c4dc4f5f803d349769a4b)
2007-10-10 13:29:48 -05:00
Andrew Tridgell
82f1a9474d r8590: added server status utility functions for checking on the status of a task via irpc
- for stream tasks, returns the number of connections

- for non-stream tasks, returns "RUNNING"

For both, return "DISABLED" or "NOT RESPONDING" appropriately
(This used to be commit 78d6303814382f7835212f5045f12180e396b540)
2007-10-10 13:29:42 -05:00
Andrew Tridgell
26a55c330a r8355: - added a vsprintf() function
- removed the --outputdir option from provision, as its not used any
  more (as ejs knows the real paths)
(This used to be commit abbf9c703c17c2edc2d978dade3619a96c38d0d9)
2007-10-10 13:20:10 -05:00
Andrew Tridgell
2dce83de0c r8338: - added a substitute_var() js library function for doing hash driven
substitution of variables in strings

- the js provision script now correctly processes provision.ldif
(This used to be commit c2946003e06c4898ba0444cd0b69d3203753be94)
2007-10-10 13:20:08 -05:00
Andrew Tridgell
683432660e r8318: added a bunch more ejs calls.
getgr*()
  getpw*()
  strlower()
  strupper()
  IfaceList()
(This used to be commit 1517ad490dd67302f38ab9dcd8a3b24b73b8d550)
2007-10-10 13:20:06 -05:00
Andrew Tridgell
f9ff72cbda r8298: - started building a library of js routines in scripting/libjs/
- switched the existing test programs over to using the library

- added install of js lib
(This used to be commit 2a444dedbe44347268affc6458196f93ca7d372b)
2007-10-10 13:19:33 -05:00